From 89fa345b84c08b4e1645d274d726440c92c6ad54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 30 Jul 2009 12:25:07 +0000
Subject: [PATCH] GCC 4.4: Make sure $PWD is not in $CPATH and $LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=16520
---
 pkgs/development/compilers/gcc-4.4/builder.sh | 4 ++--
 1 file 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 c3ec4cec315..184bee74655 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'"