From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Fri, 5 Aug 2005 07:50:54 +0000 (+0000)
Subject: * config/ltmain.m4sh (func_mode_link): Ignore errors from expr
X-Git-Tag: release-2-1b~595
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da0c4dbcbb6d01c31a2a6271cfbbf9fdc2c8d438;p=thirdparty%2Flibtool.git

* 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 90d0d4ec1..8b5b3db74 100644
--- 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 3b4320452..5205d0766 100644
--- 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