]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
* ltmain.in: Piecewise linking doesn't work when the output
authorAlbert Chin-A-Young <china@thewrittenword.com>
Wed, 24 Mar 2004 03:03:05 +0000 (03:03 +0000)
committerScott James Remnant <scott@netsplit.com>
Wed, 24 Mar 2004 03:03:05 +0000 (03:03 +0000)
file is an absolute path, use the basename only instead.

ChangeLog
ltmain.in

index 0d58a4d4a74114baa353d309bb2945df2c4141aa..8b229e2cbcdee7fa6fb281ab115a04c7e6244a5d 100644 (file)
--- 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
index d4da0a67975192da250a2c3a9b22a97e70f5bd9c..581746e9ae851089494c839ec5d81b02ab231297 100644 (file)
--- 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"