diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-05 17:58:16 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-05 17:58:16 -0500 |
| commit | 43d5c5d6db3ce33f3cf1d17ba43c7374257466ec (patch) | |
| tree | 3d24a5c3adc8f42ee14084889f2d9a9acaef5ef1 /pkgs/development/compilers/gcc/6 | |
| parent | 992bd2f6d34b2f560fc17df6fa3708fcade1abac (diff) | |
| parent | 703a9f93c1254f7bdf0350ca0462de0d78033c62 (diff) | |
| download | nixlib-43d5c5d6db3ce33f3cf1d17ba43c7374257466ec.tar nixlib-43d5c5d6db3ce33f3cf1d17ba43c7374257466ec.tar.gz nixlib-43d5c5d6db3ce33f3cf1d17ba43c7374257466ec.tar.bz2 nixlib-43d5c5d6db3ce33f3cf1d17ba43c7374257466ec.tar.lz nixlib-43d5c5d6db3ce33f3cf1d17ba43c7374257466ec.tar.xz nixlib-43d5c5d6db3ce33f3cf1d17ba43c7374257466ec.tar.zst nixlib-43d5c5d6db3ce33f3cf1d17ba43c7374257466ec.zip | |
Merge commit '703a9f93c1254f7bdf0350ca0462de0d78033c62' into gcc-simplify-flags
Diffstat (limited to 'pkgs/development/compilers/gcc/6')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 17086fdb7b8b..61e7647f968f 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -179,7 +179,7 @@ let version = "6.4.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; - bootstrap = targetPlatform == hostPlatform; + bootstrap = targetPlatform == hostPlatform; in @@ -381,7 +381,7 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - # Cross compilation + # Cross-compilation optional (targetPlatform == hostPlatform) ( let incDir = if hostPlatform.isDarwin then "${darwin.usr-include}" @@ -395,7 +395,7 @@ stdenv.mkDerivation ({ # Platform-specific flags optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ - optionals (hostPlatform.isSunOS) [ + optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred "--with-gnu-as" "--without-gnu-ld" @@ -452,7 +452,7 @@ stdenv.mkDerivation ({ STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; CC_FOR_TARGET = "${targetPlatform.config}-gcc"; 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; buildFlags = ""; |