39 lines
1.0 KiB
Diff
39 lines
1.0 KiB
Diff
|
From 3be6b766a5881b0b187c3c3c68250a9e4f7c0fa3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
Date: Tue, 3 Mar 2015 08:21:19 +0000
|
||
|
|
Subject: [PATCH 32/47] Don't search host directory during "relink" if
|
||
|
|
$inst_prefix is provided
|
||
|
|
|
||
|
|
http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html
|
||
|
|
|
||
|
|
Upstream-Status: Submitted
|
||
|
|
|
||
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
|
---
|
||
|
|
ltmain.sh | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ltmain.sh b/ltmain.sh
|
||
|
|
index 52bdbdb5f9c..82bcec39f05 100644
|
||
|
|
--- a/ltmain.sh
|
||
|
|
+++ b/ltmain.sh
|
||
|
|
@@ -6004,12 +6004,13 @@ func_mode_link ()
|
||
|
|
fi
|
||
|
|
else
|
||
|
|
# We cannot seem to hardcode it, guess we'll fake it.
|
||
|
|
+ # Default if $libdir is not relative to the prefix:
|
||
|
|
add_dir="-L$libdir"
|
||
|
|
- # Try looking first in the location we're being installed to.
|
||
|
|
+
|
||
|
|
if test -n "$inst_prefix_dir"; then
|
||
|
|
case $libdir in
|
||
|
|
[\\/]*)
|
||
|
|
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
|
||
|
|
+ add_dir="-L$inst_prefix_dir$libdir"
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
fi
|
||
|
|
--
|
||
|
|
2.12.2
|
||
|
|
|