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

Updating the ld-wrapper about linking of direct .so files. The previous

Browse Source 
regexp looking for such ld arguments did not work well with "--soname=xxx.so".
Now I added the condition that the argument should not start with a hyphen, for
it to be possibly considered a .so file to link with.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18919
This commit is contained in:
Lluís Batlle i Rossell 2009-12-13 16:18:53 +00:00
parent 6bacb66dd3
commit 193f70d887
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
elif test "$p" = "-L"; then elif test "$p" = "-L"; then
addToLibPath ${p2} addToLibPath ${p2}
n=$((n + 1)) n=$((n + 1))
elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then elif $(echo "$p" | grep -q '^[^-].*\.so\($\|\.\)'); then
path="$(dirname "$p")"; path="$(dirname "$p")";
addToLibPath "${path}" addToLibPath "${path}"
fi fi
@ -116,7 +116,7 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
# I haven't seen `-l foo', but you never know... # I haven't seen `-l foo', but you never know...
addToRPath $i addToRPath $i
break break
elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then elif $(echo "$p" | grep -q '^[^-].*\.so\($\|\.\)'); then
path="$(dirname "$p")"; path="$(dirname "$p")";
if test "$path" == "$i"; then if test "$path" == "$i"; then
addToRPath $i addToRPath $i