binutils: sort configureFlags

main
Bernardo Meurer 2 years ago
parent a3accfbea9
commit 8f7c9816aa
No known key found for this signature in database
GPG Key ID: F4C0D53B8D14C246
  1. 21
      pkgs/development/tools/misc/binutils/default.nix

@ -122,11 +122,7 @@ stdenv.mkDerivation {
configurePlatforms = [ "build" "host" "target" ];
configureFlags =
(if enableShared then [ "--enable-shared" "--disable-static" ]
else [ "--disable-shared" "--enable-static" ])
++ lib.optional withAllTargets "--enable-targets=all"
++ [
configureFlags = [
"--enable-64-bit-bfd"
"--with-system-zlib"
@ -147,12 +143,15 @@ stdenv.mkDerivation {
# 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 enableGold [
"--enable-gold"
"--enable-plugins"
];
doCheck = false; # fails
] ++ lib.optionals withAllTargets [ "--enable-targets=all" ]
++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ]
++ (if enableShared
then [ "--enable-shared" "--disable-static" ]
else [ "--disable-shared" "--enable-static" ]
);
# Fails
doCheck = false;
postFixup = lib.optionalString (enableShared && withAllTargets) ''
rm "$out"/lib/lib{bfd,opcodes}-${version}.so

Loading…
Cancel
Save