From ea648ee3d73ed1432917bd63f8ce31dc7f02feb2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 28 Mar 2025 15:48:35 +0100 Subject: [PATCH] binutils: use a no-op for makeinfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way, we don't have to touch every file generated from one we patch. It also makes it possible to do an out-of-tree build — otherwise, the source files would be copied into the build directory during Make, so there'd be no opportunity to touch some of them. This same hack is already used by the minimal-bootstrap binutils. --- .../tools/misc/binutils/default.nix | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index dd0fe97d9ff4..467884cfd2e1 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -147,22 +147,8 @@ stdenv.mkDerivation (finalAttrs: { for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in gold/Makefile.in; do sed -i "$i" -e 's|ln |ln -s |' done - - # autoreconfHook is not included for all targets. - # Call it here explicitly as well. - ${finalAttrs.postAutoreconf} ''; - postAutoreconf = '' - # As we regenerated configure build system tries hard to use - # texinfo to regenerate manuals. Let's avoid the dependency - # on texinfo in bootstrap path and keep manuals unmodified. - touch gas/doc/.dirstamp - touch gas/doc/asconfig.texi - touch gas/doc/as.1 - touch gas/doc/as.info - ''; - # As binutils takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) # @@ -247,6 +233,13 @@ stdenv.mkDerivation (finalAttrs: { ] ); + makeFlags = [ + # As we regenerated configure build system tries hard to use + # texinfo to regenerate manuals. Let's avoid the dependency + # on texinfo in bootstrap path and keep manuals unmodified. + "MAKEINFO=true" + ]; + # Fails doCheck = false;