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

* Pass -rpath flags in the same order as -L flags.

Browse Source 
* Put the Glibc linker flags in front of the GCC linker flags.  Needed
  for the stdenv-linux bootstrap.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13940
This commit is contained in:
Eelco Dolstra 2009-02-01 21:26:28 +00:00
parent 15258b7f50
commit 472a0d2057
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/build-support/gcc-wrapper/add-flags
View File

@ -5,16 +5,16 @@ if test -e @out@/nix-support/libc-cflags; then
export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
fi fi
if test -e @out@/nix-support/libc-ldflags; then
export NIX_LDFLAGS="$(cat @out@/nix-support/libc-ldflags) $NIX_LDFLAGS"
fi
if test -e @out@/nix-support/gcc-cflags; then if test -e @out@/nix-support/gcc-cflags; then
export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE"
fi fi
if test -e @out@/nix-support/libc-ldflags; then
export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)"
fi
if test -e @out@/nix-support/gcc-ldflags; then if test -e @out@/nix-support/gcc-ldflags; then
export NIX_LDFLAGS="$(cat @out@/nix-support/gcc-ldflags) $NIX_LDFLAGS" export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)"
fi fi
if test -e @out@/nix-support/libc-ldflags-before; then if test -e @out@/nix-support/libc-ldflags-before; then

37
pkgs/build-support/gcc-wrapper/ld-wrapper.sh
View File

@ -85,9 +85,11 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
n=$((n + 1)) n=$((n + 1))
done done
# Second, for each -l... switch, find the directory containing the # Second, for each directory in the library search path (-L...),
# library and add it to the rpath. # see if it contains a dynamic library used by a -l... flag. If
# so, add the directory to the rpath.
rpath="" rpath=""
addToRPath() { addToRPath() {
# If the path is not in the store, don't add it to the rpath. # If the path is not in the store, don't add it to the rpath.
# This typically happens for libraries in /tmp that are later # This typically happens for libraries in /tmp that are later
@ -98,26 +100,25 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
esac esac
rpath="$rpath $1 " rpath="$rpath $1 "
} }
findLib() {
for i in $libPath; do for i in $libPath; do
if test -f $i/lib$1.so; then n=0
while test $n -lt ${#allParams[*]}; do
p=${allParams[n]}
p2=${allParams[$((n+1))]}
if test "${p:0:2}" = "-l" -a -f "$i/lib${p:2}.so"; then
addToRPath $i addToRPath $i
break
elif test "$p" = "-l" -a -f "$i/lib${p2}"; then
# I haven't seen `-l foo', but you never know...
addToRPath $i
break
fi fi
done
}
n=0
while test $n -lt ${#allParams[*]}; do
p=${allParams[n]}
p2=${allParams[$((n+1))]}
if test "${p:0:2}" = "-l"; then
findLib ${p:2}
elif test "$p" = "-l"; then
# I haven't seen `-l foo', but you never know...
findLib ${p2}
n=$((n + 1)) n=$((n + 1))
fi done
n=$((n + 1))
done done
# Finally, add `-rpath' switches. # Finally, add `-rpath' switches.
for i in $rpath; do for i in $rpath; do