[SCM] GNU Libtool branch, master, updated. v2.2.6-156-g1d35601

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  1d3560143c215704de37550773ba87fa7cf69678 (commit)
      from  eae9d5832f84c14c69bec01d72d18bee8d38ec0d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d3560143c215704de37550773ba87fa7cf69678
Author: Alexandre Oliva <address@hidden>
Date:   Sun Nov 1 18:41:43 2009 +0100

    Fix verbose link extraction for multiply reconfigured GCC.
    
    * libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG)
    <output_verbose_link_cmd>: Drop GCC lines "Configured with" that
    may contain unrelated flags.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    8 ++++++++
 libltdl/m4/libtool.m4 |    8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 057f9a4..34995a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-04  Alexandre Oliva  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Fix verbose link extraction for multiply reconfigured GCC.
+       * libltdl/m4/libtool.m4 (_LT_LANG_CXX_CONFIG)
+       <output_verbose_link_cmd>: Drop GCC lines "Configured with" that
+       may contain unrelated flags.
+
 2009-11-02  Eric Blake  <address@hidden>
 
        Allow gcc builds with -Wall -Werror.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 02b49c9..206940e 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -5549,7 +5549,7 @@ if test "$_lt_caught_CXX_error" != yes; then
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | 
$GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | 
$GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -6214,7 +6214,7 @@ if test "$_lt_caught_CXX_error" != yes; then
              # Commands to make compiler produce verbose output that lists
              # what "hidden" libraries, object files and flags are used when
              # linking a shared library.
-             output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 
2>&1 | $GREP "\-L"'
+             output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
            else
              # FIXME: insert proper C++ library support
@@ -6298,7 +6298,7 @@ if test "$_lt_caught_CXX_error" != yes; then
                # Commands to make compiler produce verbose output that lists
                # what "hidden" libraries, object files and flags are used when
                # linking a shared library.
-               output_verbose_link_cmd='$CC -shared $CFLAGS -v 
conftest.$objext 2>&1 | $GREP "\-L"'
+               output_verbose_link_cmd='$CC -shared $CFLAGS -v 
conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
              else
                # g++ 2.7 appears to require `-G' NOT `-shared' on this
                # platform.
@@ -6309,7 +6309,7 @@ if test "$_lt_caught_CXX_error" != yes; then
                # Commands to make compiler produce verbose output that lists
                # what "hidden" libraries, object files and flags are used when
                # linking a shared library.
-               output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 
2>&1 | $GREP "\-L"'
+               output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
              fi
 
              _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'


hooks/post-receive
-- 
GNU Libtool