From 3474787b3925a0e47894cd8cc1e8569a865a5cc6 Mon Sep 17 00:00:00 2001 From: Gordon Matzigkeit Date: Wed, 14 Oct 1998 22:40:18 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ ltmain.in | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd6d6f16b..31a990b18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1998-09-24 Gordon Matzigkeit + + * ltmain.in (link): Fix problems when building only static + libraries. From Owen Taylor. + 1998-08-20 Gordon Matzigkeit * ltmain.in (install): When library_names_spec has redundancies, diff --git a/ltmain.in b/ltmain.in index a70e72b3b..d32a05996 100644 --- a/ltmain.in +++ b/ltmain.in @@ -931,8 +931,7 @@ if test -z "$show_help"; then fi install_libdir="$2" - # Now set the variables for building old libraries. - oldlibs="$objdir/$libname.a" + oldlibs= if test -z "$rpath"; then # Building a libtool convenience library. oldlibs="$objdir/$libname.al $oldlibs" @@ -1074,6 +1073,14 @@ if test -z "$show_help"; then fi fi + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + oldlibs="$oldlibs $objdir/$libname.a" + + # Transform .lo files to .o files. + oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` + fi + if test "$build_libtool_libs" = yes; then # Get the real and link names of the library. eval library_names=\"$library_names_spec\" @@ -1096,9 +1103,6 @@ if test -z "$show_help"; then # Use standard objects if they are PIC. test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'` - # Transform .lo files to .o files. - test "$build_old_libs" = yes && oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` - if test -n "$whole_archive_flag_spec"; then if test -n "$convenience"; then eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -- 2.47.2