From: Steve Hay <SteveHay@planit.com>
Date: Mon, 20 Nov 2006 10:38:07 +0000 (+0000)
Subject: Revert #29307. It doesn't fix the XXX after all. Using "$(shell @type )"
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=df06d623719a79bc228835e7155be223f4786e6c;p=p5sagit%2Fp5-mst-13.2.git

Revert #29307. It doesn't fix the XXX after all. Using "$(shell @type )"
on a temporary file just inserts the contents of the file in question
into the command-line, exactly like putting the data there in the first
place would achieve. It doesn't avoid creating a long command-line as we
would like to do.

p4raw-id: //depot/perl@29321
---

diff --git a/win32/makefile.mk b/win32/makefile.mk
index de4c9eb..80454ca 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1209,9 +1209,14 @@ $(PERLSTATICLIB): Extensions_static
 	    @$(mktmp $(subst,\,$B $(shell @type Extensions_static)) \
 	        $(PERLDLL_OBJ:s,\,$B,))
 .ELIF "$(CCTYPE)" == "GCC"
-	$(LIB32) $(LIB_FLAGS) $@ $(shell @type $(mktmp \
-	   $(subst,\,$B $(shell @type Extensions_static)) \
-	   $(PERLDLL_OBJ:s,\,$B,)))
+# XXX: It would be nice if MinGW's ar accepted a temporary file, but this
+# doesn't seem to work:
+#	$(LIB32) $(LIB_FLAGS) $@ \
+#	    $(mktmp $(LKPRE) $(subst,\,$B $(shell @type Extensions_static)) \
+#	        $(PERLDLL_OBJ:s,\,$B,) $(LKPOST))
+	$(LIB32) $(LIB_FLAGS) $@ \
+	    $(subst,\,$B $(shell @type Extensions_static)) \
+	    $(PERLDLL_OBJ:s,\,$B,)
 .ELSE
 	$(LIB32) $(LIB_FLAGS) -out:$@ @Extensions_static \
 	    @$(mktmp $(PERLDLL_OBJ:s,\,$B,))