public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33676 from obsidiansystems/less-arm-hack

Browse Source 
gcc, binutils: Narrow down ARM hack so only native builds are affected
This commit is contained in:
John Ericson
2018-01-09 17:52:45 -05:00
committed by GitHub
parent 0170512531 c98e6b6771
commit 98b3db2eef
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/misc/binutils/default.nix
View File

@@ -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";