|
Line 0
Link Here
|
|
|
1 |
--- ltmain.sh 2011-10-17 03:19:35.000000000 -0700 |
| 2 |
+++ ltmain.sh.new 2016-01-26 12:24:48.668164073 -0800 |
| 3 |
@@ -6901,7 +6901,7 @@ |
| 4 |
test "$hardcode_direct_absolute" = no; then |
| 5 |
add="$libdir/$linklib" |
| 6 |
elif test "$hardcode_minus_L" = yes; then |
| 7 |
- add_dir="-L$libdir" |
| 8 |
+ add_dir="-L$lt_sysroot$libdir" |
| 9 |
add="-l$name" |
| 10 |
elif test "$hardcode_shlibpath_var" = yes; then |
| 11 |
case :$finalize_shlibpath: in |
| 12 |
@@ -6918,7 +6918,7 @@ |
| 13 |
fi |
| 14 |
else |
| 15 |
# We cannot seem to hardcode it, guess we'll fake it. |
| 16 |
- add_dir="-L$libdir" |
| 17 |
+ add_dir="-L$lt_sysroot$libdir" |
| 18 |
# Try looking first in the location we're being installed to. |
| 19 |
if test -n "$inst_prefix_dir"; then |
| 20 |
case $libdir in |
| 21 |
@@ -8064,7 +8064,12 @@ |
| 22 |
esac |
| 23 |
fi |
| 24 |
else |
| 25 |
+ local sysrooted_libdir |
| 26 |
+ sysrooted_libdir=$libdir |
| 27 |
+ func_stripname "$lt_sysroot" '' "$libdir" |
| 28 |
+ libdir=$func_stripname_result |
| 29 |
eval flag=\"$hardcode_libdir_flag_spec\" |
| 30 |
+ libdir=sysrooted_libdir |
| 31 |
func_append dep_rpath " $flag" |
| 32 |
fi |
| 33 |
elif test -n "$runpath_var"; then |
