diff options
author | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-15 23:02:08 +0000 |
---|---|---|
committer | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-15 23:02:08 +0000 |
commit | 30d51ce826f60211be21d7bfa6c25594558b0fd3 (patch) | |
tree | ca1bddbd19641ccce5e2b0cfc18eb81d7f15a304 /ltmain.sh | |
parent | 87c815318fc04e19ad58592f840f843141f0c8a1 (diff) | |
download | gcc-30d51ce826f60211be21d7bfa6c25594558b0fd3.tar.gz |
* ltmain.sh (taglist): Initialized. Don't let `CC' tag out of it.
(relink_command): Added --tag flags.
(mode=install): If relinking fails; error out.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50855 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'ltmain.sh')
-rw-r--r-- | ltmain.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ltmain.sh b/ltmain.sh index bd76cfb4da0..e9b2634d229 100644 --- 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 |