Re: Problem with LT_PATH_NM

[Peter Rosin]

Hi Ralf,

Den 2009-03-18 18:53 skrev Ralf Wildenhues:
> Hi Peter,
>
> * Peter Rosin wrote on Wed, Mar 18, 2009 at 06:24:50PM CET:
> > > 2009-01-15  Peter Rosin  <address@hidden>
> > >     Don't settle for any dumpbin/link program as name lister.
> > This one seems really straight forward to me. So again, ok to apply?
>
> OK.  Can you add a comment that this is typical for cross compiles,
> and maybe a short NEWS entry?  Thanks.
>
> Apologies for the long delay.

That's ok, thanks for reviewing. Pushed as attached.

Cheers,
Peter

commit 032d3cc9c17b51649153f51c50d1586774799cbd
Author: Peter Rosin <address@hidden>
Date:   Wed Mar 18 19:52:27 2009 +0100

    Don't settle for any dumpbin/link program as name lister.
    
    * libltdl/m4/libtool.m4 (LT_PATH_NM): When locating dumpbin or
    link -dump, check if they appear to really be capable of name
    listing, in order to eliminate e.g. link from coreutils. This
    makes the name lister decision fall back on nm as the default if
    no acceptable candidate is found, which mainly happens on
    (arguably broken) cross compiles.
    * NEWS: Update
    * THANKS: Update
    Reports by Rudolf Leitgeb and Peter Kjellerstedt.
    
    Signed-off-by: Peter Rosin <address@hidden>
    Signed-off-by: Ralf Wildenhues <address@hidden>

diff --git a/ChangeLog b/ChangeLog
index ea0b35e..2699a09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-26  Peter Rosin  <address@hidden>
+
+       Don't settle for any dumpbin/link program as name lister.
+       * libltdl/m4/libtool.m4 (LT_PATH_NM): When locating dumpbin or
+       link -dump, check if they appear to really be capable of name
+       listing, in order to eliminate e.g. link from coreutils. This
+       makes the name lister decision fall back on nm as the default if
+       no acceptable candidate is found, which mainly happens on
+       (arguably broken) cross compiles.
+       * NEWS: Update
+       * THANKS: Update
+       Reports by Rudolf Leitgeb and Peter Kjellerstedt.
+
 2009-03-03  Ralf Wildenhues  <address@hidden>
 
        Document INNER_TESTSUITEFLAGS, drop leading space.
diff --git a/NEWS b/NEWS
index 8c3fa33..ec9c835 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,8 @@ New in 2.2.8 2009-??-??: git version 2.2.7a, Libtool team:
   - Link tests are guarded by cache variables so they can be avoided for
     bootstrapping purposes (e.g., when link tests are not possible).
   - Argument mangling of execute mode has been improved (i.e., lessened).
+  - Fix 2.1b regression that caused nm to not be the default name lister.
+    The regression affected mainly (arguably broken) cross compiles.
 
 * Miscellaneous changes:
 
diff --git a/THANKS b/THANKS
index 0f72886..1094bec 100644
--- a/THANKS
+++ b/THANKS
@@ -127,6 +127,7 @@
   Paul Eggert                  address@hidden
   Peter Eisentraut             address@hidden
   Peter Jeremy                 address@hidden
+  Peter Kjellerstedt           address@hidden
   Rainer Orth                  address@hidden
   Rainer Tammer                        address@hidden
   Ralf Menzel                  address@hidden
@@ -136,6 +137,7 @@
   Roberto Bagnara              address@hidden
   Roland Mainz                 address@hidden
   Roumen Petrov                        address@hidden
+  Rudolf Leitgeb               address@hidden
   Sam Thursfield               address@hidden
   Sebastian Wilhelmi           address@hidden
   Simon Josefsson              address@hidden
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index b6f9f06..8fca513 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3156,7 +3156,19 @@ if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"