mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* ltmain.in (SP2NL, NL2SP): Don't delete empty lines, as this
would lose for files with embedded blanks.
This commit is contained in:
parent
9a1c15d7cf
commit
43769b5711
@ -1,5 +1,8 @@
|
||||
1999-01-05 Alexandre Oliva <oliva@dcc.unicamp.br>
|
||||
|
||||
* ltmain.in (SP2NL, NL2SP): Don't delete empty lines, as this
|
||||
would lose for files with embedded blanks.
|
||||
|
||||
* ltconfig.in (cygwin, archive_cmds, archive_sym_cmds): Moved
|
||||
ltdll.c into ltmain.in, to avoid its duplication, and added a sed
|
||||
script to extract it. Also, create def and base files in $objdir,
|
||||
|
14
ltmain.in
14
ltmain.in
@ -1420,7 +1420,7 @@ compiler."
|
||||
oldlibs="$oldlibs $output_objdir/$libname.$libext"
|
||||
|
||||
# Transform .lo files to .o files.
|
||||
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
|
||||
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
|
||||
fi
|
||||
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
@ -1607,7 +1607,7 @@ EOF
|
||||
done
|
||||
|
||||
# Use standard objects if they are PIC.
|
||||
test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
|
||||
test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
||||
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
if test -n "$convenience"; then
|
||||
@ -1710,7 +1710,7 @@ EOF
|
||||
$run $rm $obj $libobj
|
||||
|
||||
# Create the old-style object.
|
||||
reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
|
||||
reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
|
||||
|
||||
output="$obj"
|
||||
eval cmds=\"$reload_cmds\"
|
||||
@ -1818,8 +1818,8 @@ EOF
|
||||
|
||||
if test -n "$libobjs" && test "$build_old_libs" = yes; then
|
||||
# Transform all the library objects into standard objects.
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
||||
fi
|
||||
|
||||
if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then
|
||||
@ -1834,7 +1834,7 @@ EOF
|
||||
*.c)
|
||||
if test -z "$export_symbols"; then
|
||||
# Add our own program objects to the preloaded list.
|
||||
dlprefiles=`$echo "X$objs $dlprefiles" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
|
||||
dlprefiles=`$echo "X$objs $dlprefiles" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
|
||||
fi
|
||||
|
||||
# Discover the nlist of each of the dlfiles.
|
||||
@ -2215,7 +2215,7 @@ fi\
|
||||
addlibs="$convenience"
|
||||
build_libtool_libs=no
|
||||
else
|
||||
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
|
||||
oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
|
||||
addlibs="$old_convenience"
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user