From 81c873e7b5232ecee92c5c0cc39e18ae434e15e2 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Wed, 31 Dec 2003 01:33:53 +0000 Subject: [PATCH] * ltmain.sh: Infer tagged configuration for link mode with the full compiler arguments available rather than only the first. --- ChangeLog | 5 +++++ ltmain.in | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 482b04207..7aef2d094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-12-31 Scott James Remnant + + * 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 * ltmain.sh: Quote $exec_cmd before it is eval'ed, so that diff --git a/ltmain.in b/ltmain.in index 907cd254c..3de8d9481 100644 --- a/ltmain.in +++ b/ltmain.in @@ -856,7 +856,7 @@ EOF ;; esac libtool_args="$nonopt" - base_compile="$nonopt" + base_compile="$nonopt $@" compile_command="$nonopt" finalize_command="$nonopt" @@ -906,7 +906,7 @@ EOF # Only attempt this if the compiler in the base link # command doesn't match the default compiler. 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, # but not from the CC environment variable when configure was run. "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; @@ -917,7 +917,7 @@ EOF if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then # Evaluate the configuration. 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` "*) # The compiler in $compile_command matches # the one in the tagged configuration. @@ -985,7 +985,6 @@ EOF # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do arg="$1" - base_compile="$base_compile $arg" shift case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- 2.47.2