aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@nrc-cnrc.gc.ca>2011-01-13 18:51:10 +0000
committerRalf Wildenhues <rwild@gcc.gnu.org>2011-01-13 18:51:10 +0000
commit3752f75a6d54bf6a19a29da309f5433f8889f69f (patch)
tree396bffce565b436a76deec4ea8919ff09f5e8727
parentbae900e15726177e71efb81f53df23cb1344dd04 (diff)
backport: ltmain.sh (relink): Use absolute path when hardcoding with -L.
Backport from Libtool: Fix relink mode to use absolute path if hardcode_minus_L. /: * ltmain.sh (relink): Use absolute path when hardcoding with -L. From-SVN: r168762
-rw-r--r--ChangeLog4
-rw-r--r--ltmain.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b8fb3529fc..c78832544d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-13 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
+
+ * ltmain.sh (relink): Use absolute path when hardcoding with -L.
+
2011-01-13 Joel Brobecker <brobecker@adacore.com>
* configure.ac: Remove readline, mmalloc, and gdb from noconfigdirs
diff --git a/ltmain.sh b/ltmain.sh
index cba8b4c7a56..a03433f1789 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -5928,7 +5928,7 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$dir"
+ add_dir="-L$absdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in