mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* 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.
This commit is contained in:
parent
02d6bd0eea
commit
5c4b25e8bd
@ -1,5 +1,10 @@
|
||||
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
|
||||
create temporaries in the current directory when output should go
|
||||
elsewhere. We must perform locking if it does.
|
||||
|
19
ltmain.in
19
ltmain.in
@ -105,6 +105,7 @@ show="$echo"
|
||||
show_help=
|
||||
execute_dlfiles=
|
||||
lo2o="s/\\.lo\$/.${objext}/"
|
||||
o2lo="s/\\.${objext}\$/.lo/"
|
||||
|
||||
# Parse our command line options once, thoroughly.
|
||||
while test $# -gt 0
|
||||
@ -3447,7 +3448,7 @@ fi\
|
||||
$show "(cd $xdir && $AR x $xabs)"
|
||||
$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
|
||||
fi
|
||||
|
||||
@ -3458,15 +3459,13 @@ fi\
|
||||
# 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
|
||||
for oldobj in $oldobjs; do
|
||||
if test ! -f $oldobj; then
|
||||
obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"`
|
||||
$show "${LN_S} $obj $oldobj"
|
||||
$run ${LN_S} $obj $oldobj || exit $?
|
||||
fi
|
||||
done
|
||||
|
||||
eval cmds=\"$old_archive_cmds\"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user