public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '43d5c5d6db3ce33f3cf1d17ba43c7374257466ec' into gcc-modernize-builder

Browse Source
This commit is contained in:
John Ericson
2017-12-07 02:19:04 -05:00
parent e82bd498d1 43d5c5d6db
commit 3afe325a3e
1286 changed files with 31659 additions and 79981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/6/default.nix
+2 -2
View File
@@ -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"