[SCM] GNU Libtool branch, master, updated. v2.2.10-183-g7206424

[Peter Rosin]

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  72064249b217a22626dd8da8a5a2ce7f12e4404d (commit)
      from  a3ecc5f26f403c816b7efaa049fc5ff0e5bc0d22 (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 72064249b217a22626dd8da8a5a2ce7f12e4404d
Author: Peter Rosin <address@hidden>
Date:   Mon Sep 13 09:48:57 2010 +0200

    Prefer $NM @file when the toolchain isn't native to $build.
    
    * libltdl/config/ltmain.m4sh (func_mode_link): Avoid calculating
    the command line length and take the @file branch *if* the file
    names needs to be converted for the toolchain and the @file
    branch works.  Fixes problems in stresstest.at when doing a cross
    from Cygwin to MinGW using MinGW native tools (a.k.a. a "faked"
    cross), and for the specific case of MSVC on Cygwin it makes the
    test pass.
    
    Signed-off-by: Peter Rosin <address@hidden>

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

Summary of changes:
 ChangeLog                  |   11 +++++++++++
 libltdl/config/ltmain.m4sh |   21 +++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 543623f..1697a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-13  Peter Rosin  <address@hidden>
+
+       Prefer $NM @file when the toolchain isn't native to $build.
+       * libltdl/config/ltmain.m4sh (func_mode_link): Avoid calculating
+       the command line length and take the @file branch *if* the file
+       names needs to be converted for the toolchain and the @file
+       branch works.  Fixes problems in stresstest.at when doing a cross
+       from Cygwin to MinGW using MinGW native tools (a.k.a. a "faked"
+       cross), and for the specific case of MSVC on Cygwin it makes the
+       test pass.
+
 2010-09-14  Eric Blake  <address@hidden>
 
        maint: ship .xz, not .lzma
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 6036f4f..18f0f39 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7349,10 +7349,23 @@ EOF
            save_ifs="$IFS"; IFS='~'
            for cmd1 in $cmds; do
              IFS="$save_ifs"
-             eval cmd=\"$cmd1\"
-             func_len " $cmd"
-             len=$func_len_result
-             if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; 
then
+             # Take the normal branch if the nm_file_list_spec branch
+             # doesn't work or if tool conversion is not needed.
+             case $nm_file_list_spec~$to_tool_file_cmd in
+               *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+                 try_normal_branch=yes
+                 eval cmd=\"$cmd1\"
+                 func_len " $cmd"
+                 len=$func_len_result
+                 ;;
+               *)
+                 try_normal_branch=no
+                 ;;
+             esac
+             if test $try_normal_branch = yes \
+                && { test "$len" -lt "$max_cmd_len" \
+                     || test "$max_cmd_len" -le -1; }
+             then
                func_show_eval "$cmd" 'exit $?'
                skipped_export=false
              elif test -n "$nm_file_list_spec"; then


hooks/post-receive
-- 
GNU Libtool