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

* Merge r3019.

Browse Source 
svn path=/nixpkgs/trunk/; revision=3186
This commit is contained in:
Eelco Dolstra 2005-06-17 09:23:15 +00:00
parent 1e5e23ce5d
commit 9cc0ac9090
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/gcc-wrapper/builder.sh
View File

@ -3,17 +3,17 @@
# Force gcc to use ld-wrapper.sh when calling ld. # Force gcc to use ld-wrapper.sh when calling ld.
cflagsCompile="-B$out/bin" cflagsCompile="-B$out/bin/"
if test -z "$nativeGlibc"; then if test -z "$nativeGlibc"; then
# The "-B$glibc/lib" flag is a quick hack to force gcc to link # The "-B$glibc/lib/" flag is a quick hack to force gcc to link
# against the crt1.o from our own glibc, rather than the one in # against the crt1.o from our own glibc, rather than the one in
# /usr/lib. The real solution is of course to prevent those paths # /usr/lib. The real solution is of course to prevent those paths
# from being used by gcc in the first place. # from being used by gcc in the first place.
# The dynamic linker is passed in `ldflagsBefore' to allow # The dynamic linker is passed in `ldflagsBefore' to allow
# explicit overrides of the dynamic linker by callers to gcc/ld # explicit overrides of the dynamic linker by callers to gcc/ld
# (the *last* value counts, so ours should come first). # (the *last* value counts, so ours should come first).
cflagsCompile="$cflagsCompile -B$glibc/lib -isystem $glibc/include" cflagsCompile="$cflagsCompile -B$glibc/lib/ -isystem $glibc/include"
ldflags="$ldflags -L$glibc/lib" ldflags="$ldflags -L$glibc/lib"
ldflagsBefore="-dynamic-linker $glibc/lib/ld-linux.so.2" ldflagsBefore="-dynamic-linker $glibc/lib/ld-linux.so.2"
fi fi

11
pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
View File

@ -78,7 +78,11 @@ if test "$dontLink" != "1"; then
extraBefore=(${extraBefore[@]} "-Wl,$i") extraBefore=(${extraBefore[@]} "-Wl,$i")
done done
for i in $NIX_LDFLAGS; do for i in $NIX_LDFLAGS; do
extraAfter=(${extraAfter[@]} "-Wl,$i") if test "${i:0:3}" = "-L/"; then
extraAfter=(${extraAfter[@]} "$i")
else
extraAfter=(${extraAfter[@]} "-Wl,$i")
fi
done done
export NIX_LDFLAGS_SET=1 export NIX_LDFLAGS_SET=1
@ -108,4 +112,7 @@ if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
. "$NIX_GCC_WRAPPER_EXEC_HOOK" . "$NIX_GCC_WRAPPER_EXEC_HOOK"
fi fi
exec @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} res=0
@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 2> $NIX_BUILD_TOP/.gcc.errors || res=$?
grep -v 'file path prefix' < $NIX_BUILD_TOP/.gcc.errors >&2 || true
exit $res