From 88efc22b44dedf423398491f9a55d1631b0b50ff Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 17 Aug 2017 18:24:07 +0300 Subject: [PATCH] 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 ```` --- pkgs/development/tools/misc/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"