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

Fix about the order of -rpath and -L in the ld-wrapper

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25128
This commit is contained in:
Lluís Batlle i Rossell 2010-12-14 15:22:25 +00:00
parent a8a01a54ab
commit e930a7385b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,11 +122,13 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
# Second, for each directory in the library search path (-L...), # Second, for each directory in the library search path (-L...),
# see if it contains a dynamic library used by a -l... flag. If # see if it contains a dynamic library used by a -l... flag. If
# so, add the directory to the rpath. # so, add the directory to the rpath.
# It's important to add the rpath in the order of -L..., so
# the link time chosen objects will be those of runtime linking.
for i in $libs; do for i in $libPath; do
for j in $libPath; do for j in $libs; do
if test -f "$j/lib$i.so"; then if test -f "$i/lib$j.so"; then
addToRPath $j addToRPath $i
break break
fi fi
done done