| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From c94da257a219873b946e08306141af7749679f67 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 3 Mar 2015 08:21:19 +0000 |
| 4 | Subject: [PATCH 34/35] Don't search host directory during "relink" if |
| 5 | $inst_prefix is provided |
| 6 | |
| 7 | http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html |
| 8 | |
| 9 | Upstream-Status: Submitted |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | ltmain.sh | 5 +++-- |
| 14 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/ltmain.sh b/ltmain.sh |
| 17 | index 52bdbdb..82bcec3 100644 |
| 18 | --- a/ltmain.sh |
| 19 | +++ b/ltmain.sh |
| 20 | @@ -6004,12 +6004,13 @@ func_mode_link () |
| 21 | fi |
| 22 | else |
| 23 | # We cannot seem to hardcode it, guess we'll fake it. |
| 24 | + # Default if $libdir is not relative to the prefix: |
| 25 | add_dir="-L$libdir" |
| 26 | - # Try looking first in the location we're being installed to. |
| 27 | + |
| 28 | if test -n "$inst_prefix_dir"; then |
| 29 | case $libdir in |
| 30 | [\\/]*) |
| 31 | - add_dir="$add_dir -L$inst_prefix_dir$libdir" |
| 32 | + add_dir="-L$inst_prefix_dir$libdir" |
| 33 | ;; |
| 34 | esac |
| 35 | fi |
| 36 | -- |
| 37 | 2.1.4 |
| 38 | |