about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-07-30 12:25:07 +0000
committerLudovic Courtès <ludo@gnu.org>2009-07-30 12:25:07 +0000
commit89fa345b84c08b4e1645d274d726440c92c6ad54 (patch)
treec6d0f35a77f073bbbc8babec8be0c568e03fd984 /pkgs/development/compilers
parentacbfd2f6790e84928c2638b5a1e239a2ba84b728 (diff)
GCC 4.4: Make sure $PWD is not in $CPATH and $LIBRARY_PATH.
svn path=/nixpkgs/trunk/; revision=16520
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/gcc-4.4/builder.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc-4.4/builder.sh b/pkgs/development/compilers/gcc-4.4/builder.sh
index c3ec4cec31550..184bee74655d9 100644
--- a/pkgs/development/compilers/gcc-4.4/builder.sh
+++ b/pkgs/development/compilers/gcc-4.4/builder.sh
@@ -42,10 +42,10 @@ if test "$noSysDirs" = "1"; then
 
     # Setting $CPATH makes sure both `gcc' and `xgcc' find the C
     # library headers, regarless of the language being compiled.
-    export CPATH="$NIX_FIXINC_DUMMY:$CPATH"
+    export CPATH="$NIX_FIXINC_DUMMY${CPATH:+:}$CPATH"
 
     # Likewise, to help it find `crti.o' and similar files.
-    export LIBRARY_PATH="$glibc_libdir:$LIBRARY_PATH"
+    export LIBRARY_PATH="$glibc_libdir${LIBRARY_PATH:+:}$LIBRARY_PATH"
 
     echo "setting \$CPATH to \`$CPATH'"
     echo "setting \$LIBRARY_PATH to \`$LIBRARY_PATH'"