* ltmain.sh: Infer tagged configuration for link mode with the

full compiler arguments available rather than only the first.

diff --git a/ChangeLog b/ChangeLog
index 482b0420710eb396570afa5347f97a31279cc788..7aef2d094dcc9606cfcb85853c7ed71f7ca7ff50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * ltmain.sh: Quote $exec_cmd before it is eval'ed, so that

diff --git a/ltmain.in b/ltmain.in
index 907cd254cae527927fc8507b8423a7e33282326b..3de8d9481849627add58cb3fb367acc7ad42dcfc 100644 (file)
--- 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
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")