public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Renamed stdenv to stdenv-linux. 

* Fix a bug that occurs when NIX_CFLAGS is empty.

svn path=/nixpkgs/trunk/; revision=241
This commit is contained in:
Eelco Dolstra 2003-08-04 07:13:29 +00:00
parent 5e4cbed2b3
commit 5f248af2a0
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/stdenv/gcc-wrapper.sh → pkgs/stdenv-linux/gcc-wrapper.sh
View File

@ -3,7 +3,6 @@
IFS= IFS=
realgcc=@GCC@ realgcc=@GCC@
libc=@LIBC@
justcompile=0 justcompile=0
for i in $@; do for i in $@; do
@ -19,7 +18,7 @@ for i in $@; do
done done
IFS=" " IFS=" "
extra=$NIX_CFLAGS extra=($NIX_CFLAGS)
if test "$justcompile" != "1"; then if test "$justcompile" != "1"; then
extra=(${extra[@]} $NIX_LDFLAGS) extra=(${extra[@]} $NIX_LDFLAGS)
fi fi

0
pkgs/stdenv/stdenv-build.sh → pkgs/stdenv-linux/stdenv-build.sh
View File

9
pkgs/stdenv-linux/stdenv.fix Normal file
View File

@ -0,0 +1,9 @@
Package(
[ ("name", "stdenv-linux")
, ("build", Relative("stdenv-linux/stdenv-build.sh"))
, ("gccwrapper", Relative("stdenv-linux/gcc-wrapper.sh"))
, ("glibc", IncludeFix("glibc/glibc.fix"))
]
)

9
pkgs/stdenv/stdenv.fix
View File

@ -1,9 +0,0 @@
Package(
[ ("name", "stdenv-linux")
, ("build", Relative("stdenv/stdenv-build.sh"))
, ("gccwrapper", Relative("stdenv/gcc-wrapper.sh"))
, ("glibc", IncludeFix("glibc/glibc.fix"))
]
)