From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Wed, 24 Mar 2004 03:03:05 +0000 (+0000)
Subject: * ltmain.in: Piecewise linking doesn't work when the output
X-Git-Tag: release-1-9b~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47a39a18017a42f4a07deddbe6346b8241d52a8e;p=thirdparty%2Flibtool.git

* ltmain.in: Piecewise linking doesn't work when the output
file is an absolute path, use the basename only instead.
---

diff --git a/ChangeLog b/ChangeLog
index 0d58a4d4a..8b229e2cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-24  Albert Chin-A-Young  <china@thewrittenword.com>
 
+	* ltmain.in: Piecewise linking doesn't work when the output
+	file is an absolute path, use the basename only instead.
+
 	* ltmain.in: When a library is installed, dependent on a
 	convenience library, and it involves relinking, the object
 	files extracted from the convenience library are not removed
diff --git a/ltmain.in b/ltmain.in
index d4da0a679..581746e9a 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -3894,6 +3894,7 @@ EOF
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
+	  output_la=`echo "$output" | $SED $basename`
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -3903,7 +3904,7 @@ EOF
 	  delfiles=
 	  last_robj=
 	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
+	  output=$output_objdir/$output_la-${k}.$objext
 	  # Loop over the list of objects to be linked.
 	  for obj in $save_libobjs
 	  do
@@ -3923,9 +3924,9 @@ EOF
 		# the last one created.
 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
 	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
+	      last_robj=$output_objdir/$output_la-${k}.$objext
 	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
+	      output=$output_objdir/$output_la-${k}.$objext
 	      objlist=$obj
 	      len=1
 	    fi
@@ -3951,7 +3952,7 @@ EOF
 	  while test "$i" -lt "$k"
 	  do
 	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
 	  done
 
 	  $echo "creating a temporary reloadable object file: $output"