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

gcc49: Reduce diff to gcc5

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2017-11-29 21:59:19 +02:00
parent aa3d195a30
commit 77b409b2cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ let version = "4.9.4";
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}" ++
@ -421,7 +421,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 =
@ -501,7 +501,7 @@ stdenv.mkDerivation ({
EXTRA_TARGET_CFLAGS = EXTRA_TARGET_CFLAGS =
if targetPlatform != hostPlatform && libcCross != null then [ if targetPlatform != hostPlatform && libcCross != null then [
"-idirafter ${libcCross.dev}/include" "-idirafter ${getDev libcCross}/include"
] ]
++ optionals (! crossStageStatic) [ ++ optionals (! crossStageStatic) [
"-B${libcCross.out}/lib" "-B${libcCross.out}/lib"