diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/binutils')
-rw-r--r-- | nixpkgs/pkgs/development/tools/misc/binutils/2.38/default.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/tools/misc/binutils/default.nix | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/2.38/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/2.38/default.nix index 1194cbeb2453..fd9a3277532e 100644 --- a/nixpkgs/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -1,7 +1,3 @@ -let - execFormatIsELF = platform: platform.parsed.kernel.execFormat.name == "elf"; -in - { stdenv , autoreconfHook , autoconf269, automake, libtool @@ -18,7 +14,7 @@ in , texinfo , zlib -, enableGold ? execFormatIsELF stdenv.targetPlatform +, enableGold ? stdenv.targetPlatform.isElf , enableShared ? !stdenv.hostPlatform.isStatic # WARN: Enabling all targets increases output size to a multiple. , withAllTargets ? false @@ -26,7 +22,7 @@ in # WARN: configure silently disables ld.gold if it's unsupported, so we need to # make sure that intent matches result ourselves. -assert enableGold -> execFormatIsELF stdenv.targetPlatform; +assert enableGold -> stdenv.targetPlatform.isElf; let diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index fe9ec6a865f9..2183d45b6f0d 100644 --- a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -1,5 +1,5 @@ let - withGold = platform: platform.parsed.kernel.execFormat.name == "elf" && !platform.isRiscV && !platform.isLoongArch64; + withGold = platform: platform.isElf && !platform.isRiscV && !platform.isLoongArch64; in { stdenv |