From: Peter O'Gorman <peter@pogma.com>
Date: Sun, 25 Jan 2004 00:13:06 +0000 (+0000)
Subject: * ltmain.in: Check for module_cmds if max_cmd_len is exceeded too.
X-Git-Tag: release-1-5-2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6086db508dee2d7d9a540a73142f9abf72c8a7ba;p=thirdparty%2Flibtool.git

* ltmain.in: Check for module_cmds if max_cmd_len is exceeded too.
---

diff --git a/ChangeLog b/ChangeLog
index 26d6a0549..031e9bcbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-25  Peter O'Gorman  <peter@pogma.com>
+
+	* ltmain.in: Check for module_cmds if max_cmd_len is exceeded too.
+
 2004-01-23  Scott James Remnant  <scott@netsplit.com>
 
 	* libtool.m4 (AC_LIBTOOL_CONFIG): Don't attempt to
diff --git a/ltmain.in b/ltmain.in
index 566ac000e..173df363d 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -3841,10 +3841,18 @@ EOF
 	  # value of $libobjs for piecewise linking.
 
 	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      eval cmds=\"$module_expsym_cmds\"
+	    else
+	      eval cmds=\"$module_cmds\"
+	    fi
+	  else
 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	    eval cmds=\"$archive_expsym_cmds\"
 	  else
 	    eval cmds=\"$archive_cmds\"
+	    fi
 	  fi
 
 	  # Append the command to remove the reloadable object files