* Initialise the PATH immediately at the start of stdenv-linux, otherwise
baseenv won't work properly (because it can't find programs such as `cat'). svn path=/nixpkgs/trunk/; revision=331
This commit is contained in:
parent
ea7ab23109
commit
eaadea1e2a
|
@ -1,5 +1,5 @@
|
||||||
# Add the directory containing the GCC wrappers to the PATH.
|
# Add the directory containing the GCC wrappers to the PATH.
|
||||||
export PATH=@OUT@/bin
|
export PATH=@OUT@/bin:$PATH
|
||||||
|
|
||||||
# Recursively add all envpkgs to the relevant environment variables.
|
# Recursively add all envpkgs to the relevant environment variables.
|
||||||
addtoenv()
|
addtoenv()
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
|
export PATH=@PATH@
|
||||||
|
export SHELL=@SHELL@
|
||||||
|
|
||||||
. @BASEENV@/setup
|
. @BASEENV@/setup
|
||||||
|
|
||||||
export NIX_CFLAGS="-isystem @GLIBC@/include $NIX_CFLAGS"
|
export NIX_CFLAGS="-isystem @GLIBC@/include $NIX_CFLAGS"
|
||||||
export NIX_LDFLAGS="-L @GLIBC@/lib -Wl,-dynamic-linker,@GLIBC@/lib/ld-linux.so.2,-rpath,@GLIBC@/lib $NIX_LDFLAGS"
|
export NIX_LDFLAGS="-L @GLIBC@/lib -Wl,-dynamic-linker,@GLIBC@/lib/ld-linux.so.2,-rpath,@GLIBC@/lib $NIX_LDFLAGS"
|
||||||
export NIX_CC=@CC@
|
export NIX_CC=@CC@
|
||||||
export NIX_CXX=@CXX@
|
export NIX_CXX=@CXX@
|
||||||
|
|
||||||
export PATH=@PATH@
|
|
||||||
export SHELL=@SHELL@
|
|
||||||
|
|
|
@ -14,7 +14,6 @@ for i in $tools; do
|
||||||
fi
|
fi
|
||||||
p=$p$i/bin
|
p=$p$i/bin
|
||||||
done
|
done
|
||||||
p=$p':$PATH'
|
|
||||||
|
|
||||||
cc=$gcc/bin/gcc
|
cc=$gcc/bin/gcc
|
||||||
cxx=$gcc/bin/g++
|
cxx=$gcc/bin/g++
|
||||||
|
|
|
@ -4,7 +4,7 @@ export PATH=/bin:/usr/bin
|
||||||
|
|
||||||
mkdir $out || exit 1
|
mkdir $out || exit 1
|
||||||
|
|
||||||
p='$PATH:/usr/local/bin:/usr/bin:/bin'
|
p='/usr/local/bin:/usr/bin:/bin'
|
||||||
|
|
||||||
cc=/usr/bin/gcc
|
cc=/usr/bin/gcc
|
||||||
cxx=/usr/bin/g++
|
cxx=/usr/bin/g++
|
||||||
|
|
Loading…
Reference in a new issue