* ltmain.sh (taglist): Initialized. Don't let `CC' tag out of it.

(relink_command): Added --tag flags.
(mode=install): If relinking fails; error out.
This commit is contained in:
Alexandre Oliva 2002-03-15 23:05:24 +00:00
parent 4c563ebfce
commit 6243d5dd94
2 changed files with 14 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2002-03-15 Alexandre Oliva <aoliva@redhat.com>
* ltmain.sh (taglist): Initialized. Don't let `CC' tag out of it.
(relink_command): Added --tag flags.
(mode=install): If relinking fails; error out.
2002-03-12 Richard Henderson <rth@redhat.com>
* Makefile.in (NOTPARALLEL): New. Use it instead of explicit

View File

@ -107,6 +107,7 @@ show_help=
execute_dlfiles=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
taglist=
# Parse our command line options once, thoroughly.
while test $# -gt 0
@ -140,6 +141,7 @@ do
CC)
# Don't test for the "default" C tag, as we know, it's there, but
# not specially marked.
taglist="$taglist $tagname"
;;
*)
if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
@ -4299,7 +4301,11 @@ fi\
fi
done
# Quote the link command for shipping.
relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
tagopts=
for tag in $taglist; do
tagopts="$tagopts --tag $tag"
done
relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
# Only create the output if not a dry run.
@ -4605,7 +4611,7 @@ relink_command=\"$relink_command\""
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
continue
exit 1
fi
fi