diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-08-23 14:24:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-23 14:24:04 -0400 |
| commit | 9884a3b17a817b4b5aee2ce01a10a08f98653a62 (patch) | |
| tree | 7420bf1dc065d07b39fae679d4b1e00621ccb9bd | |
| parent | e6661db29f05b4e18fb881b51c4a4d171318f56e (diff) | |
| parent | 41abe41fd946c567f80356d6cc439b13970c6924 (diff) | |
| download | nixlib-9884a3b17a817b4b5aee2ce01a10a08f98653a62.tar nixlib-9884a3b17a817b4b5aee2ce01a10a08f98653a62.tar.gz nixlib-9884a3b17a817b4b5aee2ce01a10a08f98653a62.tar.bz2 nixlib-9884a3b17a817b4b5aee2ce01a10a08f98653a62.tar.lz nixlib-9884a3b17a817b4b5aee2ce01a10a08f98653a62.tar.xz nixlib-9884a3b17a817b4b5aee2ce01a10a08f98653a62.tar.zst nixlib-9884a3b17a817b4b5aee2ce01a10a08f98653a62.zip | |
Merge pull request #28374 from obsidiansystems/binutils-arm
binutils: Pass --build --host on non-arm
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e02cf1667cdf..a528cb0bba93 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -84,7 +84,12 @@ stdenv.mkDerivation rec { else "-static-libgcc"; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = stdenv.lib.optionals (targetPlatform != hostPlatform) [ "build" "host" "target" ]; + configurePlatforms = + # TODO(@Ericson2314): Figure out what's going wrong with Arm + if hostPlatform == targetPlatform && targetPlatform.isArm32 + then [] + else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configureFlags = [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ] ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop" |