Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

binutils: avoid texinfo dependency during bootstrap #210132

Merged
merged 1 commit into from
Jan 14, 2023
Merged

binutils: avoid texinfo dependency during bootstrap #210132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions pkgs/development/tools/misc/binutils/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ in
, noSysDirs
, perl
, substitute
, texinfo
, zlib

, enableGold ? withGold stdenv.targetPlatform
Expand Down Expand Up @@ -52,7 +51,7 @@ let
targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
in

stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = targetPrefix + "binutils";
inherit version;

Expand Down Expand Up @@ -110,10 +109,12 @@ stdenv.mkDerivation {

strictDeps = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
# texinfo was removed here in https://github.com/NixOS/nixpkgs/pull/210132
# to reduce rebuilds during stdenv bootstrap. Please don't add it back without
# checking the impact there first.
nativeBuildInputs = [
trofi marked this conversation as resolved.
Show resolved Hide resolved
bison
perl
texinfo
]
++ lib.optionals targetPlatform.isiOS [ autoreconfHook ]
++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ]
Expand Down Expand Up @@ -144,6 +145,20 @@ stdenv.mkDerivation {
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}
Copy link
Member

@Artturin Artturin Jan 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️ it should be okay to run the touch commands twice

'';

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
Expand Down Expand Up @@ -226,4 +241,4 @@ stdenv.mkDerivation {
# collision due to the ld/as wrappers/symlinks in the latter.
priority = 10;
};
}
})