diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-01-09 17:52:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 17:52:45 -0500 |
| commit | 98b3db2eefc0d1e12973e7d11be6ab7366b1063b (patch) | |
| tree | b61e40d1cb6e2eb46015c7e876f6f2e50ad73a9a /pkgs/development/tools | |
| parent | 01705125314fa0c7753f27c3dd7c4bfbda55c375 (diff) | |
| parent | c98e6b67710c7c04ddab56cb09a14540e6668dbc (diff) | |
| download | nixlib-98b3db2eefc0d1e12973e7d11be6ab7366b1063b.tar nixlib-98b3db2eefc0d1e12973e7d11be6ab7366b1063b.tar.gz nixlib-98b3db2eefc0d1e12973e7d11be6ab7366b1063b.tar.bz2 nixlib-98b3db2eefc0d1e12973e7d11be6ab7366b1063b.tar.lz nixlib-98b3db2eefc0d1e12973e7d11be6ab7366b1063b.tar.xz nixlib-98b3db2eefc0d1e12973e7d11be6ab7366b1063b.tar.zst nixlib-98b3db2eefc0d1e12973e7d11be6ab7366b1063b.zip | |
Merge pull request #33676 from obsidiansystems/less-arm-hack
gcc, binutils: Narrow down ARM hack so only native builds are affected
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 2 |
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 9cf0e1236e0c..05d0d21a179b 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. configurePlatforms = # TODO(@Ericson2314): Figure out what's going wrong with Arm - if hostPlatform == targetPlatform && targetPlatform.isArm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm then [] else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; |