* ltmain.in (old_archive_cmds): Ensure that there are always .o

objects available before running old_archive_cmds.

diff --git a/ChangeLog b/ChangeLog
index 8d264e85e8f174f5a8ed767a13169ac74125af95..743c0393a8b37ac31a6ed9a8f885e0976def3d27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,11 @@
        would never match; fixed.
        Reported by Stephan Kulow <coolo@itm.mu-luebeck.de>
 
+1999-04-26  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+
+       * ltmain.in (old_archive_cmds): Ensure that there are always .o
+       objects available before running old_archive_cmds.
+
 1999-04-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * libtool.m4 (OBJDUMP): Pass it to ltconfig.

diff --git a/ltmain.in b/ltmain.in
index 98b43088b1b9103b0bd0f99335e78604467b0c93..b5a83e662673f34a71e163feda543dd6aa01fec7 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -3455,6 +3455,19 @@ fi\
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
        eval cmds=\"$old_archive_from_new_cmds\"
       else
+        # 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
+
        eval cmds=\"$old_archive_cmds\"
       fi
       IFS="${IFS=      }"; save_ifs="$IFS"; IFS='~'