]>
Commit | Line | Data |
---|---|---|
cfe6d66f JB |
1 | --- binutils-2.17.50.0.17/ltmain.sh.orig 2007-06-18 19:29:28.000000000 +0200 |
2 | +++ binutils-2.17.50.0.17/ltmain.sh 2007-06-21 22:27:40.096178020 +0200 | |
3 | @@ -4306,6 +4306,7 @@ | |
e18892bc | 4 | |
cfe6d66f | 5 | if test "$linkmode" = prog || test "$mode" = relink; then |
e18892bc JB |
6 | add_shlibpath= |
7 | + add_prefix_dir= | |
8 | add_dir= | |
9 | add= | |
10 | # Finalize command for both is simple: just hardcode it. | |
cfe6d66f | 11 | @@ -4342,10 +4343,22 @@ |
e18892bc JB |
12 | add="-l$name" |
13 | fi | |
14 | ||
15 | + if test -n "$inst_prefix_dir"; then | |
16 | + case "$libdir" in | |
17 | + [\\/]*) | |
18 | + add_prefix_dir="-L$inst_prefix_dir$libdir" | |
19 | + ;; | |
20 | + esac | |
21 | + fi | |
22 | + | |
23 | + # add_prefix_dir must be appended instead, otherwise it can | |
24 | + # possibly be overrided by any hardcoded -L/... path in deplibs | |
cfe6d66f | 25 | if test "$linkmode" = prog; then |
e18892bc JB |
26 | + test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" |
27 | test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" | |
28 | test -n "$add" && finalize_deplibs="$add $finalize_deplibs" | |
29 | else | |
30 | + test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" | |
31 | test -n "$add_dir" && deplibs="$add_dir $deplibs" | |
32 | test -n "$add" && deplibs="$add $deplibs" | |
33 | fi |