From d678749593ca6ec5213d283e6f3d0e09ecd7a0bc Mon Sep 17 00:00:00 2001 From: Albert Chin-A-Young Date: Fri, 5 Aug 2005 07:52:05 +0000 Subject: [PATCH] * config/ltmain.m4sh (func_mode_link): Ignore errors from expr when determining if piece-wise linking should be done. --- ChangeLog | 5 +++++ config/ltmain.m4sh | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3a2125ee..713c4c758 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-05 Albert Chin-A-Young + + * config/ltmain.m4sh (func_mode_link): Ignore errors from expr + when determining if piece-wise linking should be done. + 2005-08-04 Ralf Wildenhues * config/ltmain.m4sh (func_mode_link) : Add diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh index 04f4ac6d9..6f3c610f9 100644 --- a/config/ltmain.m4sh +++ b/config/ltmain.m4sh @@ -5041,8 +5041,9 @@ EOF fi fi - if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then + 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 # The command line is too long to link in one step, link piecewise @@ -5089,7 +5090,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 @@ -6292,8 +6293,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 @@ -6313,7 +6314,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 -- 2.47.2