mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-01-18 14:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Gordon Matzigkeit 1998-10-14 22:40:18 +00:00 committed by Gordon Matzigkeit
parent 153ada99da
commit 3474787b39
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
1998-09-24 Gordon Matzigkeit <gord@trick.fig.org>
* ltmain.in (link): Fix problems when building only static
libraries. From Owen Taylor.
1998-08-20 Gordon Matzigkeit <gord@trick.fig.org> 1998-08-20 Gordon Matzigkeit <gord@trick.fig.org>
* ltmain.in (install): When library_names_spec has redundancies, * ltmain.in (install): When library_names_spec has redundancies,

14
ltmain.in
View File

@ -931,8 +931,7 @@ if test -z "$show_help"; then
fi fi
install_libdir="$2" install_libdir="$2"
# Now set the variables for building old libraries. oldlibs=
oldlibs="$objdir/$libname.a"
if test -z "$rpath"; then if test -z "$rpath"; then
# Building a libtool convenience library. # Building a libtool convenience library.
oldlibs="$objdir/$libname.al $oldlibs" oldlibs="$objdir/$libname.al $oldlibs"
@ -1074,6 +1073,14 @@ if test -z "$show_help"; then
fi fi
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 if test "$build_libtool_libs" = yes; then
# Get the real and link names of the library. # Get the real and link names of the library.
eval library_names=\"$library_names_spec\" eval library_names=\"$library_names_spec\"
@ -1096,9 +1103,6 @@ if test -z "$show_help"; then
# Use standard objects if they are PIC. # Use standard objects if they are PIC.
test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'` 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 "$whole_archive_flag_spec"; then
if test -n "$convenience"; then if test -n "$convenience"; then
eval libobjs=\"\$libobjs $whole_archive_flag_spec\" eval libobjs=\"\$libobjs $whole_archive_flag_spec\"