* 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 c2d2075529cae9b44a114f6a287870197f663dd3..331c06e6105d3cfc5665df926e49fb4a5046d48a 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 5a70241e73fea60fbc043a984bb057cef877556b..4e329af80af2ab5dd9fb5e8069b7fff454904977 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2903,6 +2903,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='~'