From: Peter O'Gorman <peter@pogma.com>
Date: Thu, 3 Feb 2005 03:53:07 +0000 (+0000)
Subject: * ltmain.in [darwin]: Don't add installed libs to temp_rpath when
X-Git-Tag: release-1-5-12~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5299f72937d4acf89c2ced64b62d42684c342229;p=thirdparty%2Flibtool.git

* ltmain.in [darwin]: Don't add installed libs to temp_rpath when
building executables on darwin, or other systems which use
hardcode_automatic. It may break our wrapper scripts.
---

diff --git a/ChangeLog b/ChangeLog
index 51778622e..0404a4857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-03  Peter O'Gorman  <peter@pogma.com>
+
+	* ltmain.in [darwin]: Don't add installed libs to temp_rpath when
+	building executables on darwin, or other systems which use
+	hardcode_automatic. It may break our wrapper scripts.
+
 2005-02-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* ltmain.in, libtoolize.in: Exit with nonzero status on write failures
diff --git a/ltmain.in b/ltmain.in
index a1662f485..1f37b6f9c 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2222,6 +2222,8 @@ EOF
 	# it will not redefine variables installed, or shouldnotlink
 	installed=yes
 	shouldnotlink=no
+	avoidtemprpath=
+
 
 	# Read the .la file
 	case $lib in
@@ -2320,6 +2322,7 @@ EOF
 	    dir="$libdir"
 	    absdir="$libdir"
 	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
 	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 	    dir="$ladir"
@@ -2404,7 +2407,7 @@ EOF
 	  if test -n "$library_names" &&
 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath " in
 	      *" $dir "*) ;;