diff options
| author | Drew Hess <src@drewhess.com> | 2018-01-08 20:03:33 -0800 |
|---|---|---|
| committer | Drew Hess <src@drewhess.com> | 2018-01-08 20:03:33 -0800 |
| commit | 3ed545ab31146e607c57649936c75869d6aa9ba2 (patch) | |
| tree | 9135f36644fe31c30314953449c4cf2143f09c3b /pkgs/development/compilers/gcc/7 | |
| parent | b195d8ab079ed7afbc583b165255483230008b51 (diff) | |
| download | nixlib-3ed545ab31146e607c57649936c75869d6aa9ba2.tar nixlib-3ed545ab31146e607c57649936c75869d6aa9ba2.tar.gz nixlib-3ed545ab31146e607c57649936c75869d6aa9ba2.tar.bz2 nixlib-3ed545ab31146e607c57649936c75869d6aa9ba2.tar.lz nixlib-3ed545ab31146e607c57649936c75869d6aa9ba2.tar.xz nixlib-3ed545ab31146e607c57649936c75869d6aa9ba2.tar.zst nixlib-3ed545ab31146e607c57649936c75869d6aa9ba2.zip | |
Revert "gcc, binutils: Get rid of 32-bit ARM configure flag exception"
This commit breaks native armv7l-linux builds. Revert it until it can be root-caused. This reversion does not affect other platforms or cross-compiling. This reverts commit 0f5c80463176f7b146e8ef1943a3bbd61d4cbaf0.
Diffstat (limited to 'pkgs/development/compilers/gcc/7')
| -rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index c20546b59e8e..74ec6ee26a1e 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -312,7 +312,11 @@ stdenv.mkDerivation ({ dontDisableStatic = true; # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configurePlatforms = + # TODO(@Ericson2314): Figure out what's going wrong with Arm + if hostPlatform == targetPlatform && targetPlatform.isArm + then [] + else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = # Basic dependencies |