Commit e67e72c7 by Alexandre Oliva Committed by Alexandre Oliva

ltmain.sh (taglist): Initialized.

* ltmain.sh (taglist): Initialized.  Don't let `CC' tag out of it.
(relink_command): Added --tag flags.
(mode=install): If relinking fails; error out.

From-SVN: r50855
parent 201d203b
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> 2002-03-12 Richard Henderson <rth@redhat.com>
* Makefile.in (NOTPARALLEL): New. Use it instead of explicit * Makefile.in (NOTPARALLEL): New. Use it instead of explicit
......
...@@ -107,6 +107,7 @@ show_help= ...@@ -107,6 +107,7 @@ show_help=
execute_dlfiles= execute_dlfiles=
lo2o="s/\\.lo\$/.${objext}/" lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/" o2lo="s/\\.${objext}\$/.lo/"
taglist=
# Parse our command line options once, thoroughly. # Parse our command line options once, thoroughly.
while test $# -gt 0 while test $# -gt 0
...@@ -140,6 +141,7 @@ do ...@@ -140,6 +141,7 @@ do
CC) CC)
# Don't test for the "default" C tag, as we know, it's there, but # Don't test for the "default" C tag, as we know, it's there, but
# not specially marked. # not specially marked.
taglist="$taglist $tagname"
;; ;;
*) *)
if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
...@@ -4299,7 +4301,11 @@ fi\ ...@@ -4299,7 +4301,11 @@ fi\
fi fi
done done
# Quote the link command for shipping. # 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"` relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
# Only create the output if not a dry run. # Only create the output if not a dry run.
...@@ -4605,7 +4611,7 @@ relink_command=\"$relink_command\"" ...@@ -4605,7 +4611,7 @@ relink_command=\"$relink_command\""
if $run eval "$relink_command"; then : if $run eval "$relink_command"; then :
else else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
continue exit 1
fi fi
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment