summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-08-17 18:24:07 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-08-17 18:37:10 +0300
commit88efc22b44dedf423398491f9a55d1631b0b50ff (patch)
tree70f2762f0e37f2725089dbce9462c34f049c2ffb /pkgs
parentd8bea2498d022adb183e57a035c91ed60b483b1f (diff)
downloadnixlib-88efc22b44dedf423398491f9a55d1631b0b50ff.tar
nixlib-88efc22b44dedf423398491f9a55d1631b0b50ff.tar.gz
nixlib-88efc22b44dedf423398491f9a55d1631b0b50ff.tar.bz2
nixlib-88efc22b44dedf423398491f9a55d1631b0b50ff.tar.lz
nixlib-88efc22b44dedf423398491f9a55d1631b0b50ff.tar.xz
nixlib-88efc22b44dedf423398491f9a55d1631b0b50ff.tar.zst
nixlib-88efc22b44dedf423398491f9a55d1631b0b50ff.zip
binutils: Don't pass --host etc. when not cross-compiling
Or linuxHeaders build fails on ARM (non-cross) since e826a6a2477404:

````
  HOSTCC  scripts/basic/fixdep
/nix/store/9glws7v2j28blv1n7azqr3b43qadjd1j-binutils-2.28.1/bin/ld: unrecognised emulation mode: armelf_linux_eabi
Supported emulations: armelf_linux armelf armelfb armelfb_linux
collect2: error: ld returned 1 exit status
````
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/misc/binutils/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 390acab15b85..e02cf1667cdf 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     else "-static-libgcc";
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = stdenv.lib.optionals (targetPlatform != hostPlatform) [ "build" "host" "target" ];
   configureFlags =
     [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"