diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-07 02:19:04 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-07 02:19:04 -0500 |
| commit | 3afe325a3e2f906ba512fb7a2f28f79496711592 (patch) | |
| tree | dccc4ee2957953e809d2a5ef55d3f19061b92775 /pkgs/development/compilers/gcc/6 | |
| parent | e82bd498d1a2a28fb20249569a6f49fcaab9aca8 (diff) | |
| parent | 43d5c5d6db3ce33f3cf1d17ba43c7374257466ec (diff) | |
| download | nixlib-3afe325a3e2f906ba512fb7a2f28f79496711592.tar nixlib-3afe325a3e2f906ba512fb7a2f28f79496711592.tar.gz nixlib-3afe325a3e2f906ba512fb7a2f28f79496711592.tar.bz2 nixlib-3afe325a3e2f906ba512fb7a2f28f79496711592.tar.lz nixlib-3afe325a3e2f906ba512fb7a2f28f79496711592.tar.xz nixlib-3afe325a3e2f906ba512fb7a2f28f79496711592.tar.zst nixlib-3afe325a3e2f906ba512fb7a2f28f79496711592.zip | |
Merge commit '43d5c5d6db3ce33f3cf1d17ba43c7374257466ec' into gcc-modernize-builder
Diffstat (limited to 'pkgs/development/compilers/gcc/6')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b0e42f3b472e..fbc490026067 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -180,7 +180,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 @@ -390,7 +390,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" |