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

(relink_command): Added --tag flags.
(mode=install): If relinking fails; error out.

diff --git a/ChangeLog b/ChangeLog
index 0368c195cb90699f607b9f8fe1064f3544ccf2de..5ce74f78cecbb5920453dc1ed7b192f60941f40f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/ltmain.sh b/ltmain.sh
index bd76cfb4da08af7b119bc6f0ff8afcc4fd62f0c4..e9b2634d2298cf0c1a400bede6968fe9cb59f500 100644 (file)
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -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