|
Line
Link Here
|
| 0 |
-- ltmain.sh |
0 |
++ ltmain.sh |
|
Lines 7955-7967
Link Here
|
| 7955 |
|
7955 |
|
| 7956 |
# Find the relevant object directory and library name. |
7956 |
# Find the relevant object directory and library name. |
| 7957 |
if test yes = "$installed"; then |
7957 |
if test yes = "$installed"; then |
| 7958 |
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
7958 |
if test ! -f "${lt_sysroot:-${SYSROOT}}$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then |
| 7959 |
func_warning "library '$lib' was moved." |
7959 |
func_warning "library '$lib' was moved." |
| 7960 |
dir=$ladir |
7960 |
dir=$ladir |
| 7961 |
absdir=$abs_ladir |
7961 |
absdir=$abs_ladir |
| 7962 |
libdir=$abs_ladir |
7962 |
libdir=$abs_ladir |
| 7963 |
else |
7963 |
else |
| 7964 |
dir=$lt_sysroot$libdir |
7964 |
dir=${lt_sysroot:-${SYSROOT}}$libdir |
| 7965 |
absdir=$lt_sysroot$libdir |
7965 |
absdir=$lt_sysroot$libdir |
| 7966 |
fi |
7966 |
fi |
| 7967 |
test yes = "$hardcode_automatic" && avoidtemprpath=yes |
7967 |
test yes = "$hardcode_automatic" && avoidtemprpath=yes |
|
Lines 8344-8350
Link Here
|
| 8344 |
test no = "$hardcode_direct_absolute"; then |
8344 |
test no = "$hardcode_direct_absolute"; then |
| 8345 |
add=$libdir/$linklib |
8345 |
add=$libdir/$linklib |
| 8346 |
elif test yes = "$hardcode_minus_L"; then |
8346 |
elif test yes = "$hardcode_minus_L"; then |
| 8347 |
add_dir=-L$libdir |
8347 |
add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir |
| 8348 |
add=-l$name |
8348 |
add=-l$name |
| 8349 |
elif test yes = "$hardcode_shlibpath_var"; then |
8349 |
elif test yes = "$hardcode_shlibpath_var"; then |
| 8350 |
case :$finalize_shlibpath: in |
8350 |
case :$finalize_shlibpath: in |
|
Lines 8361-8367
Link Here
|
| 8361 |
fi |
8361 |
fi |
| 8362 |
else |
8362 |
else |
| 8363 |
# We cannot seem to hardcode it, guess we'll fake it. |
8363 |
# We cannot seem to hardcode it, guess we'll fake it. |
| 8364 |
add_dir=-L$libdir |
8364 |
add_dir=-L${lt_sysroot:-${SYSROOT}}$libdir |
| 8365 |
# Try looking first in the location we're being installed to. |
8365 |
# Try looking first in the location we're being installed to. |
| 8366 |
if test -n "$inst_prefix_dir"; then |
8366 |
if test -n "$inst_prefix_dir"; then |
| 8367 |
case $libdir in |
8367 |
case $libdir in |
