diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-13 16:18:53 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-12-13 16:18:53 +0000 |
| commit | 193f70d8877034c8b9df5538f538198e7fdc4a09 (patch) | |
| tree | f68f73be0611256190d8d67b876b3188064796f4 /pkgs/build-support | |
| parent | 6bacb66dd3ec9a8819472becc369a479b65b00c3 (diff) | |
Updating the ld-wrapper about linking of direct .so files. The previous
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
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/ld-wrapper.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh index 52aa57bc1ea77..bf3c2620f29ec 100644 --- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh @@ -81,7 +81,7 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then elif test "$p" = "-L"; then addToLibPath ${p2} n=$((n + 1)) - elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then + elif $(echo "$p" | grep -q '^[^-].*\.so\($\|\.\)'); then path="$(dirname "$p")"; addToLibPath "${path}" fi @@ -116,7 +116,7 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then # I haven't seen `-l foo', but you never know... addToRPath $i break - elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then + elif $(echo "$p" | grep -q '^[^-].*\.so\($\|\.\)'); then path="$(dirname "$p")"; if test "$path" == "$i"; then addToRPath $i |