binutils: rename gold to enableGold

main
Bernardo Meurer 2 years ago
parent c748ef4d1b
commit 8e5d2ead61
No known key found for this signature in database
GPG Key ID: F4C0D53B8D14C246
  1. 8
      pkgs/development/tools/misc/binutils/default.nix
  2. 2
      pkgs/stdenv/linux/default.nix
  3. 2
      pkgs/stdenv/linux/make-bootstrap-tools.nix
  4. 2
      pkgs/top-level/all-packages.nix

@ -15,7 +15,7 @@ in
, perl
, texinfo
, zlib
, gold ? execFormatIsELF stdenv.targetPlatform
, enableGold ? execFormatIsELF stdenv.targetPlatform
, enableShared ? !stdenv.hostPlatform.isStatic
# Enabling all targets increases output size to a multiple.
, withAllTargets ? false, libbfd, libopcodes
@ -23,7 +23,7 @@ in
# configure silently disables ld.gold if it's unsupported,
# so we need to make sure that intent matches result ourselves.
assert gold -> execFormatIsELF stdenv.targetPlatform;
assert enableGold -> execFormatIsELF stdenv.targetPlatform;
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
@ -147,7 +147,7 @@ stdenv.mkDerivation {
# The easiest thing for us to do is not leave it to chance, and force
# the program prefix to be what we want it to be.
"--program-prefix=${targetPrefix}"
] ++ lib.optionals gold [
] ++ lib.optionals enableGold [
"--enable-gold"
"--enable-plugins"
];
@ -167,7 +167,7 @@ stdenv.mkDerivation {
passthru = {
inherit targetPrefix;
hasGold = gold;
hasGold = enableGold;
isGNU = true;
};

@ -204,7 +204,7 @@ in
# Rebuild binutils to use from stage2 onwards.
overrides = self: super: {
binutils-unwrapped = super.binutils-unwrapped.override {
gold = false;
enableGold = false;
};
inherit (prevStage)
ccWrapperStdenv

@ -37,7 +37,7 @@ in with pkgs; rec {
bootBinutils = binutils.bintools.override {
withAllTargets = false;
# Don't need two linkers, disable whatever's not primary/default.
gold = false;
enableGold = false;
# bootstrap is easier w/static
enableShared = false;
};

@ -14644,7 +14644,7 @@ with pkgs;
};
binutils_nogold = lowPrio (wrapBintoolsWith {
bintools = binutils-unwrapped.override {
gold = false;
enableGold = false;
};
});
binutilsNoLibc = wrapBintoolsWith {

Loading…
Cancel
Save