From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 2 Jan 2008 19:35:56 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (func_mode_link): When creating
X-Git-Tag: release-2-1b~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=920b97072f3cf8a9e04e8e6cafc1126e73a71710;p=thirdparty%2Flibtool.git

* libltdl/config/ltmain.m4sh (func_mode_link): When creating
reloadable object files, avoid issuing plain `rm -f' without
further arguments, even if the line length limit is ridiculously
low as in the `Run tests with low max_cmd_len' test.  This
failure is exposed on NetBSD.
Report by Patrick Welche.
---

diff --git a/ChangeLog b/ChangeLog
index c674683f3..f09fc7792 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-01-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* libltdl/config/ltmain.m4sh (func_mode_link): When creating
+	reloadable object files, avoid issuing plain `rm -f' without
+	further arguments, even if the line length limit is ridiculously
+	low as in the `Run tests with low max_cmd_len' test.  This
+	failure is exposed on NetBSD.
+	Report by Patrick Welche.
+
 	* Makefile.am (EXTRA_DIST): Add ChangeLog.2007.
 	* ChangeLog.2007: New, rotated, from...
 	* ChangeLog: ...here.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 8db819d93..43e17152f 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -6184,7 +6184,10 @@ EOF
 	      # reloadable object file.  All subsequent reloadable object
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
 	      delfiles="$delfiles $output"
 
 	    else
@@ -6199,7 +6202,7 @@ EOF
 	      # Append the command to create the export file.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$output"; then
+	      if test -n "$last_robj"; then
 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
 	    fi