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

I think I fixed the gcc builder for the usual stdenv, I broke in the commit

Browse Source 
before.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18356
This commit is contained in:
Lluís Batlle i Rossell 2009-11-15 17:48:10 +00:00
parent 307cbd7b3b
commit 81f695899a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/gcc-4.3/builder.sh
View File

@ -40,7 +40,6 @@ if test "$noSysDirs" = "1"; then
export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i"
done done
set -x
if test -n "$cross"; then if test -n "$cross"; then
if test -z "$crossStageStatic"; then if test -z "$crossStageStatic"; then
extraXCFlags="-B${glibcCross}/lib -idirafter ${glibcCross}/include" extraXCFlags="-B${glibcCross}/lib -idirafter ${glibcCross}/include"
@ -65,10 +64,10 @@ if test "$noSysDirs" = "1"; then
"${makeFlagsArray[@]}" \ "${makeFlagsArray[@]}" \
NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
CFLAGS_FOR_BUILD="$NIX_EXTRA_X_CFLAGS $NIX_EXTRA_X_LDFLAGS" \ CFLAGS_FOR_BUILD="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
CFLAGS_FOR_TARGET="$NIX_EXTRA_X_CFLAGS $NIX_EXTRA_X_LDFLAGS" \ CFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
LDFLAGS_FOR_BUILD="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ LDFLAGS_FOR_BUILD="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
LDFLAGS_FOR_TARGET="$NIX_EXTRA_X_CFLAGS $NIX_EXTRA_X_LDFLAGS" \ LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
) )
fi fi
@ -85,7 +84,6 @@ if test "$noSysDirs" = "1"; then
LIMITS_H_TEST=true \ LIMITS_H_TEST=true \
) )
fi fi
set +x
fi fi
if test -n "$cross"; then if test -n "$cross"; then