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

GCC: explicitly use some dev outputs

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 21:14:38 +03:00 committed by Vladimír Čunát
parent 1819181726
commit e254750560
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/gcc/4.5/default.nix
View File

@ -165,7 +165,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}"
@ -323,7 +323,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

4
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -215,7 +215,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}"
@ -398,7 +398,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

4
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -241,7 +241,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}"
@ -460,7 +460,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

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

@ -244,7 +244,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}"
@ -467,7 +467,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

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

@ -242,7 +242,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}"
@ -460,7 +460,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