diff options
| author | Steve Hay <SteveHay@planit.com> | 2006-11-20 10:38:07 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2006-11-20 10:38:07 +0000 |
| commit | df06d623719a79bc228835e7155be223f4786e6c (patch) | |
| tree | 7ae6e45abe0bbe80cce8d8588d557198e1916206 /win32 | |
| parent | 58389ed28d97caddc55b782fd9ebca329852f29d (diff) | |
| download | perl-df06d623719a79bc228835e7155be223f4786e6c.tar.gz | |
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
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index de4c9eb9aa..80454ca91d 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,)) |