From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Tue, 27 Apr 1999 10:34:45 +0000 (+0000)
Subject: * ltmain.in (old_archive_cmds): Iterate on oldobjs to find out
X-Git-Tag: release-1-3~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c268bb905847c9d20207f070f9ffb769d02ef01;p=thirdparty%2Flibtool.git

* ltmain.in (old_archive_cmds): Iterate on oldobjs to find out
which links to object files we must create.  Do not test for empty
pic_flag to create such links.  Use objext when searching for
object files extracted from convenience library.
---

diff --git a/ChangeLog b/ChangeLog
index 78ffcdc4c..eb137e03f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-04-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* ltmain.in (old_archive_cmds): Iterate on oldobjs to find out
+	which links to object files we must create.  Do not test for empty 
+	pic_flag to create such links.  Use objext when searching for
+	object files extracted from convenience library.
+
 	* ltconfig.in (compiler_c_o): Make sure the compiler does not
 	create temporaries in the current directory when output should go
 	elsewhere.  We must perform locking if it does.
diff --git a/ltmain.in b/ltmain.in
index 4e329af80..8a57a7684 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -105,6 +105,7 @@ show="$echo"
 show_help=
 execute_dlfiles=
 lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
 
 # Parse our command line options once, thoroughly.
 while test $# -gt 0
@@ -2895,7 +2896,7 @@ fi\
 	  $show "(cd $xdir && $AR x $xabs)"
 	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
 
-	  oldobjs="$oldobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
 	done
       fi
 
@@ -2906,15 +2907,13 @@ fi\
 	# Ensure that we have .o objects in place incase we decided
 	# not to build a shared library, and have fallen back to building
 	# static libs even though --disable-static was passed!
-	if test "X$pic_flag" = X; then
-	  for obj in $libobjs; do
-	    oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"`
-	    if test ! -f $oldobj; then
-	      $show "${LN_S} $obj $oldobj"
-	      $run ${LN_S} $obj $oldobj || exit $?
-	    fi
-	  done
-	fi
+	for oldobj in $oldobjs; do
+	  if test ! -f $oldobj; then
+	    obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"`
+	    $show "${LN_S} $obj $oldobj"
+	    $run ${LN_S} $obj $oldobj || exit $?
+	  fi
+	done
 
 	eval cmds=\"$old_archive_cmds\"
       fi