diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1999-12-05 17:23:57 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-12-05 17:23:57 +0000 |
| commit | e2207946be493a7d79118bca7a38e9516e51aa27 (patch) | |
| tree | 0d567f062789255949b6f75cf40f69505c53da45 /win32 | |
| parent | 4ce4f76ea90ddd8879f53d5ef4d9ff6bb82eb5f0 (diff) | |
| download | perl-e2207946be493a7d79118bca7a38e9516e51aa27.tar.gz | |
change#4653 was missing a patch reject
p4raw-link: @4653 on //depot/perl: 7a958ec31151f9d03a26dcab8abdf5c57315dc96
p4raw-id: //depot/perl@4655
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index a8c5d78807..592588a98d 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1037,31 +1037,31 @@ $(PERL95_OBJ) : $(CORE_H) $(X2P_OBJ) : $(CORE_H) perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl - $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ - CCTYPE=$(CCTYPE) > perldll.def + $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) \ + $(BUILDOPT) CCTYPE=$(CCTYPE) > perldll.def $(PERLDLL): perldll.def $(PERLDLL_OBJ) .IF "$(CCTYPE)" == "BORLAND" - $(LINK32) -Tpd -ap $(LINK_FLAGS) \ + $(LINK32) -Tpd -ap $(BLINK_FLAGS) \ @$(mktmp c0d32$(o) $(PERLDLL_OBJ:s,\,\\)\n \ $@,\n \ $(LIBFILES)\n \ perldll.def\n) $(IMPLIB) $*.lib $@ .ELIF "$(CCTYPE)" == "GCC" - $(LINK32) -mdll -o $@ -Wl,--base-file -Wl,perl.base $(LINK_FLAGS) \ + $(LINK32) -mdll -o $@ -Wl,--base-file -Wl,perl.base $(BLINK_FLAGS) \ $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,\\) $(LIBFILES) $(LKPOST)) dlltool --output-lib $(PERLIMPLIB) \ --dllname $(PERLDLL:b).dll \ --def perldll.def \ --base-file perl.base \ --output-exp perl.exp - $(LINK32) -mdll -o $@ $(LINK_FLAGS) \ + $(LINK32) -mdll -o $@ $(BLINK_FLAGS) \ $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,\\) $(LIBFILES) \ perl.exp $(LKPOST)) .ELSE $(LINK32) -dll -def:perldll.def -out:$@ \ - @$(mktmp $(LINK_FLAGS) $(LIBFILES) $(PERLDLL_OBJ:s,\,\\)) + @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(PERLDLL_OBJ:s,\,\\)) .ENDIF $(XCOPY) $(PERLIMPLIB) $(COREDIR) |