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

gcc6: Unify some differences with gcc5 

In particular, fixes build with the new shuffled outputs.
This commit is contained in:
Tuomas Tynkkynen 2016-08-30 21:56:31 +03:00
parent 4223e83a68
commit 0cfb79afac
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,8 +165,8 @@ let version = "6.2.0";
" --disable-libatomic " + # libatomic requires libc " --disable-libatomic " + # libatomic requires libc
" --disable-decimal-float" # libdecnumber requires libc " --disable-decimal-float" # libdecnumber requires libc
else else
(if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"
else " --with-headers=${libcCross.dev}/include") + else " --with-headers=${getDev libcCross}/include") +
# Ensure that -print-prog-name is able to find the correct programs. # Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) ( (stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" + " --with-as=${binutilsCross}/bin/${cross.config}-as" +
@ -247,7 +247,7 @@ stdenv.mkDerivation ({
++ stdenv.lib.optional (libpthread != null) libpthread; ++ stdenv.lib.optional (libpthread != null) libpthread;
extraCPPSpec = extraCPPSpec =
concatStrings (intersperse " " concatStrings (intersperse " "
(map (x: "-I${x}/include") extraCPPDeps)); (map (x: "-I${x.dev or x}/include") extraCPPDeps));
extraLibSpec = extraLibSpec =
if libpthreadCross != null if libpthreadCross != null
then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
@ -411,6 +411,7 @@ stdenv.mkDerivation ({
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
--with-gmp=${gmp.crossDrv} --with-gmp=${gmp.crossDrv}
--with-mpfr=${mpfr.crossDrv} --with-mpfr=${mpfr.crossDrv}
--with-mpc=${libmpc.crossDrv}
--disable-libstdcxx-pch --disable-libstdcxx-pch
--without-included-gettext --without-included-gettext
--with-system-zlib --with-system-zlib
@ -456,7 +457,7 @@ stdenv.mkDerivation ({
# Likewise, the LTO code doesn't find zlib. # Likewise, the LTO code doesn't find zlib.
CPATH = concatStrings CPATH = concatStrings
(intersperse ":" (map (x: x + "/include") (intersperse ":" (map (x: "${x.dev or x}/include")
(optionals (zlib != null) [ zlib ] (optionals (zlib != null) [ zlib ]
++ optionals langJava [ boehmgc ] ++ optionals langJava [ boehmgc ]
++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk xlibs
@ -479,7 +480,7 @@ stdenv.mkDerivation ({
EXTRA_TARGET_CFLAGS = EXTRA_TARGET_CFLAGS =
if cross != null && libcCross != null then [ if cross != null && libcCross != null then [
"-idirafter ${libcCross.dev}/include" "-idirafter ${getDev libcCross}/include"
] ]
++ optionals (! crossStageStatic) [ ++ optionals (! crossStageStatic) [
"-B${libcCross.out}/lib" "-B${libcCross.out}/lib"