diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-23 14:34:33 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-23 14:38:08 -0400 |
| commit | ebc9b161cd184502bf4912b9348a507e2d0540da (patch) | |
| tree | 81dec783b302d9695a8194cdfdfd777b7b3c225b /pkgs/development/compilers/gcc/6/default.nix | |
| parent | 71186e73455a4e06e96a31da34b76f84e545ba1f (diff) | |
| download | nixpkgs-ebc9b161cd184502bf4912b9348a507e2d0540da.tar nixpkgs-ebc9b161cd184502bf4912b9348a507e2d0540da.tar.gz nixpkgs-ebc9b161cd184502bf4912b9348a507e2d0540da.tar.bz2 nixpkgs-ebc9b161cd184502bf4912b9348a507e2d0540da.tar.lz nixpkgs-ebc9b161cd184502bf4912b9348a507e2d0540da.tar.xz nixpkgs-ebc9b161cd184502bf4912b9348a507e2d0540da.tar.zst nixpkgs-ebc9b161cd184502bf4912b9348a507e2d0540da.zip | |
gcc: Add `configurePlatforms` exception for Arm 32
...just as we did for binutils. When the underlying issue is resolved (probably with a configure script patch or lib/systems/parse.nix change), this should be reverted.
Diffstat (limited to 'pkgs/development/compilers/gcc/6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 87c5b11c5e1..bc408e28f58 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -326,7 +326,12 @@ 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.isArm32 + then [] + else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configureFlags = " ${if hostPlatform.isSunOS then " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + |