mirror of
git://git.savannah.gnu.org/libtool.git
synced 2024-12-15 06:49:57 +08:00
* ltmain.sh: Infer tagged configuration for link mode with the
full compiler arguments available rather than only the first.
This commit is contained in:
parent
7983eaf90b
commit
81c873e7b5
@ -1,3 +1,8 @@
|
|||||||
|
2003-12-31 Scott James Remnant <scott@netsplit.com>
|
||||||
|
|
||||||
|
* ltmain.sh: Infer tagged configuration for link mode with the
|
||||||
|
full compiler arguments available rather than only the first.
|
||||||
|
|
||||||
2003-12-31 Alexandre Duret-Lutz <adl@gnu.org>
|
2003-12-31 Alexandre Duret-Lutz <adl@gnu.org>
|
||||||
|
|
||||||
* ltmain.sh: Quote $exec_cmd before it is eval'ed, so that
|
* ltmain.sh: Quote $exec_cmd before it is eval'ed, so that
|
||||||
|
@ -856,7 +856,7 @@ EOF
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
libtool_args="$nonopt"
|
libtool_args="$nonopt"
|
||||||
base_compile="$nonopt"
|
base_compile="$nonopt $@"
|
||||||
compile_command="$nonopt"
|
compile_command="$nonopt"
|
||||||
finalize_command="$nonopt"
|
finalize_command="$nonopt"
|
||||||
|
|
||||||
@ -906,7 +906,7 @@ EOF
|
|||||||
# Only attempt this if the compiler in the base link
|
# Only attempt this if the compiler in the base link
|
||||||
# command doesn't match the default compiler.
|
# command doesn't match the default compiler.
|
||||||
if test -n "$available_tags" && test -z "$tagname"; then
|
if test -n "$available_tags" && test -z "$tagname"; then
|
||||||
case "$base_compile " in
|
case $base_compile in
|
||||||
# Blanks in the command may have been stripped by the calling shell,
|
# Blanks in the command may have been stripped by the calling shell,
|
||||||
# but not from the CC environment variable when configure was run.
|
# but not from the CC environment variable when configure was run.
|
||||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
|
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
|
||||||
@ -917,7 +917,7 @@ EOF
|
|||||||
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
|
||||||
# Evaluate the configuration.
|
# Evaluate the configuration.
|
||||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
|
||||||
case "$base_compile " in
|
case $base_compile in
|
||||||
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
|
"$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
|
||||||
# The compiler in $compile_command matches
|
# The compiler in $compile_command matches
|
||||||
# the one in the tagged configuration.
|
# the one in the tagged configuration.
|
||||||
@ -985,7 +985,6 @@ EOF
|
|||||||
# Go through the arguments, transforming them on the way.
|
# Go through the arguments, transforming them on the way.
|
||||||
while test "$#" -gt 0; do
|
while test "$#" -gt 0; do
|
||||||
arg="$1"
|
arg="$1"
|
||||||
base_compile="$base_compile $arg"
|
|
||||||
shift
|
shift
|
||||||
case $arg in
|
case $arg in
|
||||||
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
||||||
|
Loading…
Reference in New Issue
Block a user