summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc/6
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2016-09-06 13:54:13 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2016-09-15 17:56:50 -0500
commitcf004ae56ee8261c9e5070e83ee14fc21f8e58d6 (patch)
tree9406bf642ac545b40cdf70bdca67c16d119f4901 /pkgs/development/compilers/gcc/6
parentf2e753a90c3f7a9e715216501b9b0f95e766701f (diff)
downloadnixlib-cf004ae56ee8261c9e5070e83ee14fc21f8e58d6.tar
nixlib-cf004ae56ee8261c9e5070e83ee14fc21f8e58d6.tar.gz
nixlib-cf004ae56ee8261c9e5070e83ee14fc21f8e58d6.tar.bz2
nixlib-cf004ae56ee8261c9e5070e83ee14fc21f8e58d6.tar.lz
nixlib-cf004ae56ee8261c9e5070e83ee14fc21f8e58d6.tar.xz
nixlib-cf004ae56ee8261c9e5070e83ee14fc21f8e58d6.tar.zst
nixlib-cf004ae56ee8261c9e5070e83ee14fc21f8e58d6.zip
gcc: add --with-native-system-header-dir for clang
gcc needs to be able find system headers. Without this, gcc fails to build because
/usr/include is not available.

Note: stdenv.libc should be available for all stdenv's, I think.
Diffstat (limited to 'pkgs/development/compilers/gcc/6')
-rw-r--r--pkgs/development/compilers/gcc/6/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 57172a2d9db9..b33437ee868c 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -360,8 +360,8 @@ stdenv.mkDerivation ({
         )
       )
     }
-    ${if (stdenv ? glibc && cross == null)
-      then " --with-native-system-header-dir=${stdenv.glibc.dev}/include"
+    ${if cross == null
+      then " --with-native-system-header-dir=${getDev stdenv.libc}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
     ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}