From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Fri, 5 Aug 2005 07:53:43 +0000 (+0000)
Subject: * ltmain.in (link mode): Ignore errors from expr when
X-Git-Tag: release-1-5-20~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f374e977274844759052b59cfc62d311a5a674;p=thirdparty%2Flibtool.git

* ltmain.in (link mode): Ignore errors from expr when
determining if piece-wise linking should be done.
---

diff --git a/ChangeLog b/ChangeLog
index 8d8b6f49e..9cd41c77e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-05  Albert Chin-A-Young  <china@thewrittenword.com>
+
+	* ltmain.in (link mode): Ignore errors from expr when
+	determining if piece-wise linking should be done.
+
 2005-08-03  Peter Ekberg  <peda@lysator.liu.se>
 
 	* libltdl/ltdl.c (sys_wll_open): Set the error mode so that no
diff --git a/ltmain.in b/ltmain.in
index 392b89b1f..d07ab2481 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -3887,7 +3887,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
@@ -3922,7 +3923,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
@@ -5184,7 +5185,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