From eb8618ea4118093b2d9acb3408fc0c720806335e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Jun 2008 11:09:00 +0000 Subject: [PATCH] * Support the case where gcc has been built without g++. svn path=/nixpkgs/trunk/; revision=12196 --- pkgs/build-support/gcc-wrapper-new/builder.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/gcc-wrapper-new/builder.sh b/pkgs/build-support/gcc-wrapper-new/builder.sh index dd25455b864..9a28e305b39 100644 --- a/pkgs/build-support/gcc-wrapper-new/builder.sh +++ b/pkgs/build-support/gcc-wrapper-new/builder.sh @@ -40,7 +40,9 @@ else # Glibc headers, since they appear *before* the libstdc++ headers. # So we add them here using -isystem. Note that `add-flags' adds # the libc flags before the gcc flags. - gccCFlags="$gccCFlags -isystem $(echo $gcc/include/c++/*.*)" + if test -e $gcc/include/c++/*.*; then + gccCFlags="$gccCFlags -isystem $(echo $gcc/include/c++/*.*)" + fi # GCC shows $gcc/lib in `gcc -print-search-dirs', but not # $gcc/lib64 (even though it does actually search there...)..