* config/ltmain.m4sh (func_mode_link): Ignore errors from expr

when determining if piece-wise linking should be done.

diff --git a/ChangeLog b/ChangeLog
index 90d0d4ec1a3d6d413135f3fce27f8f4088b341bf..8b5b3db7464bea2e6f2c912faa8f879fac4b0e3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-05  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * config/ltmain.m4sh (func_mode_link): Ignore errors from expr
+       when determining if piece-wise linking should be done.
+
 2005-08-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * config/ltmain.m4sh (func_mode_link) <cwrappersource>: Add

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 3b4320452040c5eab24b7e1de7cdac706e036624..5205d076626cabf67e65cb063caad2094eafff12 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -5073,7 +5073,8 @@ EOF
          fi
        fi
 
-       if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+       if test "X$skipped_export" != "X:" &&
+          len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
           test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
          :
        else
@@ -5132,7 +5133,7 @@ EOF
            do
              eval test_cmds=\"$reload_cmds $objlist $last_robj\"
              if test "X$objlist" = X ||
-                { len=`expr "X$test_cmds" : ".*"` &&
+                { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
                   test "$len" -le "$max_cmd_len"; }; then
                objlist="$objlist $obj"
              else
@@ -6345,8 +6346,8 @@ fi\
        fi
        eval cmds=\"$old_archive_cmds\"
 
-       if len=`expr "X$cmds" : ".*"` &&
-            test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+       if len=`expr "X$cmds" : ".*" 2>/dev/null` &&
+          test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
          cmds=$old_archive_cmds
        else
          # the command line is too long to link in one step, link in parts
@@ -6366,7 +6367,7 @@ fi\
            oldobjs="$objlist $obj"
            objlist="$objlist $obj"
            eval test_cmds=\"$old_archive_cmds\"
-           if len=`expr "X$test_cmds" : ".*"` &&
+           if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
               test "$len" -le "$max_cmd_len"; then
              :
            else