diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-29 22:55:34 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-29 23:09:17 +0200 |
| commit | 0f249a73548ed950acd95bd9d64c4ea05522876f (patch) | |
| tree | 63b2bcd0db565485df443cf437772a74898d96d6 /pkgs/development/compilers/gcc | |
| parent | d7a0695c43f5b27329aef96bc4fd3e31427228f5 (diff) | |
| download | nixlib-0f249a73548ed950acd95bd9d64c4ea05522876f.tar nixlib-0f249a73548ed950acd95bd9d64c4ea05522876f.tar.gz nixlib-0f249a73548ed950acd95bd9d64c4ea05522876f.tar.bz2 nixlib-0f249a73548ed950acd95bd9d64c4ea05522876f.tar.lz nixlib-0f249a73548ed950acd95bd9d64c4ea05522876f.tar.xz nixlib-0f249a73548ed950acd95bd9d64c4ea05522876f.tar.zst nixlib-0f249a73548ed950acd95bd9d64c4ea05522876f.zip | |
gccSnapshot: Reduce diff to gcc7
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/snapshot/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 38df9de08c2c..48840ffa7c23 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -105,7 +105,7 @@ let version = "7-20170409"; gccFpu = platform.gcc.fpu or null; gccFloat = platform.gcc.float or null; gccMode = platform.gcc.mode or null; - in + in optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ optional (gccAbi != null) "--with-abi=${gccAbi}" ++ @@ -412,7 +412,7 @@ stdenv.mkDerivation ({ CC_FOR_TARGET = "${targetPlatform.config}-gcc"; NM_FOR_TARGET = "${targetPlatform.config}-nm"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, cross != null + # If we are making a cross compiler, targetPlatform != hostPlatform NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = |