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

gcc*: use stdenv.cc.libc instead of stdenv.libc

Browse Source 
The latter doesn't exist on Linux.
This commit is contained in:
Vladimír Čunát
2016-09-16 23:23:33 +02:00
parent 8610a34474
commit 5de2857a54
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/4.8/default.nix
+1 -1
View File
@@ -361,7 +361,7 @@ stdenv.mkDerivation ({
${if cross == null ${if cross == null
then if stdenv.isDarwin then if stdenv.isDarwin
then " --with-native-system-header-dir=${darwin.usr-include}" then " --with-native-system-header-dir=${darwin.usr-include}"
else " --with-native-system-header-dir=${getDev stdenv.libc}/include" else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
else ""} else ""}
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
pkgs/development/compilers/gcc/4.9/default.nix
+1 -1
View File
@@ -368,7 +368,7 @@ stdenv.mkDerivation ({
${if cross == null ${if cross == null
then if stdenv.isDarwin then if stdenv.isDarwin
then " --with-native-system-header-dir=${darwin.usr-include}" then " --with-native-system-header-dir=${darwin.usr-include}"
else " --with-native-system-header-dir=${getDev stdenv.libc}/include" else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
else ""} else ""}
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
pkgs/development/compilers/gcc/5/default.nix
+1 -1
View File
@@ -366,7 +366,7 @@ stdenv.mkDerivation ({
${if cross == null ${if cross == null
then if stdenv.isDarwin then if stdenv.isDarwin
then " --with-native-system-header-dir=${darwin.usr-include}" then " --with-native-system-header-dir=${darwin.usr-include}"
else " --with-native-system-header-dir=${getDev stdenv.libc}/include" else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
else ""} else ""}
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
pkgs/development/compilers/gcc/6/default.nix
+1 -1
View File
@@ -364,7 +364,7 @@ stdenv.mkDerivation ({
${if cross == null ${if cross == null
then if stdenv.isDarwin then if stdenv.isDarwin
then " --with-native-system-header-dir=${darwin.usr-include}" then " --with-native-system-header-dir=${darwin.usr-include}"
else " --with-native-system-header-dir=${getDev stdenv.libc}/include" else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
else ""} else ""}
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}