projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2004-12-05 Tomer Levi <Tomer.Levi@nsc.com>
[deliverable/binutils-gdb.git]
/
ltmain.sh
diff --git
a/ltmain.sh
b/ltmain.sh
index 62a679c2c15ff47223fbcf8b7ef5d1a690452dd6..c3547e5a5616fe295eb4520d49735679f436ec3f 100644
(file)
--- a/
ltmain.sh
+++ b/
ltmain.sh
@@
-55,8
+55,8
@@
modename="$progname"
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.4a
-TIMESTAMP=" (1.641.2.256 2001/05/28 20:09:07)"
+VERSION=1.4a
-GCC3.0
+TIMESTAMP=" (1.641.2.256 2001/05/28 20:09:07
with GCC-local changes
)"
default_mode=
help="Try \`$progname --help' for more information."
default_mode=
help="Try \`$progname --help' for more information."
@@
-107,6
+107,7
@@
show_help=
execute_dlfiles=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
execute_dlfiles=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+taglist=
# Parse our command line options once, thoroughly.
while test $# -gt 0
# 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.
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
;;
*)
if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
@@
-4299,7
+4301,11
@@
fi\
fi
done
# Quote the link command for shipping.
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.
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
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
fi
fi
This page took
0.030822 seconds
and
4
git commands to generate.