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

gcc5: Reduce diff to gcc6

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2017-11-29 21:53:13 +02:00
parent 0c9ba0e149
commit aa3d195a30
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/gcc/5/default.nix
View File

@ -110,7 +110,7 @@ let version = "5.5.0";
gccFpu = platform.gcc.fpu or null; gccFpu = platform.gcc.fpu or null;
gccFloat = platform.gcc.float or null; gccFloat = platform.gcc.float or null;
gccMode = platform.gcc.mode or null; gccMode = platform.gcc.mode or null;
in in
optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccArch != null) "--with-arch=${gccArch}" ++
optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
optional (gccAbi != null) "--with-abi=${gccAbi}" ++ optional (gccAbi != null) "--with-abi=${gccAbi}" ++
@ -201,8 +201,6 @@ stdenv.mkDerivation ({
inherit sha256; inherit sha256;
}; };
hardeningDisable = [ "format" ];
inherit patches; inherit patches;
outputs = [ "out" "lib" "man" "info" ]; outputs = [ "out" "lib" "man" "info" ];
@ -211,6 +209,8 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev; libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" ];
# This should kill all the stdinc frameworks that gcc and friends like to # This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths. # insert into default search paths.
prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
@ -356,9 +356,6 @@ stdenv.mkDerivation ({
}" }"
] ++ ] ++
# Optional features
optional (isl != null) "--with-isl=${isl}" ++
(if enableMultilib (if enableMultilib
then ["--enable-multilib" "--disable-libquadmath"] then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++ else ["--disable-multilib"]) ++
@ -367,6 +364,9 @@ stdenv.mkDerivation ({
then ["--enable-plugin"] then ["--enable-plugin"]
else ["--disable-plugin"]) ++ else ["--disable-plugin"]) ++
# Optional features
optional (isl != null) "--with-isl=${isl}" ++
# Java options # Java options
optionals langJava [ optionals langJava [
"--with-ecj-jar=${javaEcj}" "--with-ecj-jar=${javaEcj}"
@ -431,7 +431,7 @@ stdenv.mkDerivation ({
CC_FOR_TARGET = "${targetPlatform.config}-gcc"; CC_FOR_TARGET = "${targetPlatform.config}-gcc";
NM_FOR_TARGET = "${targetPlatform.config}-nm"; NM_FOR_TARGET = "${targetPlatform.config}-nm";
CXX_FOR_TARGET = "${targetPlatform.config}-g++"; 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; NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc;
dontStrip = true; dontStrip = true;
configureFlags = configureFlags =
@ -490,7 +490,7 @@ stdenv.mkDerivation ({
CPATH = makeSearchPathOutput "dev" "include" ([] CPATH = makeSearchPathOutput "dev" "include" ([]
++ optional (zlib != null) zlib ++ optional (zlib != null) zlib
++ optionals langJava [ boehmgc ] ++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ] ++ optionals javaAwtGtk [ gmp mpfr ]
++ optional (libpthread != null) libpthread ++ optional (libpthread != null) libpthread

6
pkgs/development/compilers/gcc/6/default.nix
View File

@ -181,7 +181,7 @@ let version = "6.4.0";
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
bootstrap = targetPlatform == hostPlatform; bootstrap = targetPlatform == hostPlatform;
in in
@ -383,7 +383,7 @@ stdenv.mkDerivation ({
# Ada # Ada
optional langAda "--enable-libada" ++ optional langAda "--enable-libada" ++
# Cross compilation # Cross-compilation
optional (targetPlatform == hostPlatform) ( optional (targetPlatform == hostPlatform) (
let incDir = if hostPlatform.isDarwin let incDir = if hostPlatform.isDarwin
then "${darwin.usr-include}" then "${darwin.usr-include}"
@ -396,7 +396,7 @@ stdenv.mkDerivation ({
# Platform-specific flags # Platform-specific flags
optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ 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" "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
# On Illumos/Solaris GNU as is preferred # On Illumos/Solaris GNU as is preferred
"--with-gnu-as" "--without-gnu-ld" "--with-gnu-as" "--without-gnu-ld"