diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-18 13:00:24 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-18 13:00:24 -0400 |
| commit | 41abe41fd946c567f80356d6cc439b13970c6924 (patch) | |
| tree | b2ffd56a707f63b23d9e4befca11660ba74dac97 | |
| parent | 7320fa9d4581e634fec4db848d7a4d157a51303d (diff) | |
| download | nixlib-41abe41fd946c567f80356d6cc439b13970c6924.tar nixlib-41abe41fd946c567f80356d6cc439b13970c6924.tar.gz nixlib-41abe41fd946c567f80356d6cc439b13970c6924.tar.bz2 nixlib-41abe41fd946c567f80356d6cc439b13970c6924.tar.lz nixlib-41abe41fd946c567f80356d6cc439b13970c6924.tar.xz nixlib-41abe41fd946c567f80356d6cc439b13970c6924.tar.zst nixlib-41abe41fd946c567f80356d6cc439b13970c6924.zip | |
binutils: Pass --build --host on non-arm
This is needed for build != host == target builds. Moreoever, we want to move towards always passing all 3, and the previous change to unbreak Arm moved us away from that.
| -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" |