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

* ltmain.in (old_archive_cmds): Iterate on oldobjs to find out

Browse Source 
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.
This commit is contained in:
Alexandre Oliva 1999-04-27 10:34:46 +00:00 committed by Alexandre Oliva
parent 02d6bd0eea
commit 5c4b25e8bd
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
1999-04-27 Alexandre Oliva <oliva@dcc.unicamp.br> 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 * ltconfig.in (compiler_c_o): Make sure the compiler does not
create temporaries in the current directory when output should go create temporaries in the current directory when output should go
elsewhere. We must perform locking if it does. elsewhere. We must perform locking if it does.

19
ltmain.in
View File

@ -105,6 +105,7 @@ show="$echo"
show_help= show_help=
execute_dlfiles= execute_dlfiles=
lo2o="s/\\.lo\$/.${objext}/" lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
# Parse our command line options once, thoroughly. # Parse our command line options once, thoroughly.
while test $# -gt 0 while test $# -gt 0
@ -3447,7 +3448,7 @@ fi\
$show "(cd $xdir && $AR x $xabs)" $show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $? $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 done
fi fi
@ -3458,15 +3459,13 @@ fi\
# Ensure that we have .o objects in place incase we decided # Ensure that we have .o objects in place incase we decided
# not to build a shared library, and have fallen back to building # not to build a shared library, and have fallen back to building
# static libs even though --disable-static was passed! # static libs even though --disable-static was passed!
if test "X$pic_flag" = X; then for oldobj in $oldobjs; do
for obj in $libobjs; do if test ! -f $oldobj; then
oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"` obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"`
if test ! -f $oldobj; then $show "${LN_S} $obj $oldobj"
$show "${LN_S} $obj $oldobj" $run ${LN_S} $obj $oldobj || exit $?
$run ${LN_S} $obj $oldobj || exit $? fi
fi done
done
fi
eval cmds=\"$old_archive_cmds\" eval cmds=\"$old_archive_cmds\"
fi fi