diff options
| author | Steve Hay <SteveHay@planit.com> | 2005-03-10 11:25:36 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2005-03-10 11:25:36 +0000 |
| commit | bfbbc0be4da2c5ef1aac071cb1386a2d693a18d9 (patch) | |
| tree | 0d8e0a7800ad3cf91e72679e5d33cd2414d2328f /win32 | |
| parent | 29ddc2a4443cff956621f7b060b68c8ff93220d4 (diff) | |
| download | perl-bfbbc0be4da2c5ef1aac071cb1386a2d693a18d9.tar.gz | |
More Win32 dmake fixes
Use $B macro as per change 23991 in more places, and fix some syntax
errors in the subst's (missing trailing ",")
Tested with GCC and MSVC. I don't have BCC available, so those parts
are untested.
p4raw-id: //depot/perl@24014
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 137abe9762..0a7b5fd7eb 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -999,13 +999,13 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl $(MINIPERL) : $(MINIDIR) $(MINI_OBJ) $(CRTIPMLIBS) .IF "$(CCTYPE)" == "BORLAND" $(LINK32) -Tpe -ap $(BLINK_FLAGS) \ - @$(mktmp c0x32$(o) $(MINI_OBJ:s,\,\\),$(@:s,\,\\),,$(LIBFILES),) + @$(mktmp c0x32$(o) $(MINI_OBJ:s,\,$B,),$(@:s,\,$B,),,$(LIBFILES),) .ELIF "$(CCTYPE)" == "GCC" $(LINK32) -v -mconsole -o $@ $(BLINK_FLAGS) \ - $(mktmp $(LKPRE) $(MINI_OBJ:s,\,\\) $(LIBFILES) $(LKPOST)) + $(mktmp $(LKPRE) $(MINI_OBJ:s,\,$B,) $(LIBFILES) $(LKPOST)) .ELSE $(LINK32) -subsystem:console -out:$@ \ - @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(MINI_OBJ:s,\,\\)) + @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(MINI_OBJ:s,\,$B,)) .ENDIF $(MINIDIR) : @@ -1049,14 +1049,14 @@ perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static .IF "$(CCTYPE)" == "BORLAND" $(LINK32) -Tpd -ap $(BLINK_FLAGS) \ - @$(mktmp c0d32$(o) $(PERLDLL_OBJ:s,\,\\)\n \ + @$(mktmp c0d32$(o) $(PERLDLL_OBJ:s,\,$B,)\n \ $@,\n \ $(LIBFILES)\n \ perldll.def\n) $(IMPLIB) $*.lib $@ .ELIF "$(CCTYPE)" == "GCC" $(LINK32) -mdll -o $@ -Wl,--base-file -Wl,perl.base $(BLINK_FLAGS) \ - $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,\\) \ + $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,$B,) \ $(shell $(MINIPERL) -I..\lib buildext.pl --list-static-libs|tr \\\\ /) \ $(LIBFILES) $(LKPOST)) dlltool --output-lib $(PERLIMPLIB) \ @@ -1065,14 +1065,14 @@ $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static --base-file perl.base \ --output-exp perl.exp $(LINK32) -mdll -o $@ $(BLINK_FLAGS) \ - $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,\\) \ + $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,$B,) \ $(shell $(MINIPERL) -I..\lib buildext.pl --list-static-libs|tr \\\\ /) \ $(LIBFILES) perl.exp $(LKPOST)) .ELSE $(LINK32) -dll -def:perldll.def -out:$@ \ $(shell $(MINIPERL) -I..\lib buildext.pl --list-static-libs) \ @$(mktmp -base:0x28000000 $(BLINK_FLAGS) $(DELAYLOAD) $(LIBFILES) \ - $(PERLDLL_RES) $(PERLDLL_OBJ:s,\,\\)) + $(PERLDLL_RES) $(PERLDLL_OBJ:s,\,$B,)) .ENDIF $(XCOPY) $(PERLIMPLIB) $(COREDIR) @@ -1105,13 +1105,13 @@ $(X2P) : $(MINIPERL) $(X2P_OBJ) $(MINIPERL) ..\x2p\s2p.PL .IF "$(CCTYPE)" == "BORLAND" $(LINK32) -Tpe -ap $(BLINK_FLAGS) \ - @$(mktmp c0x32$(o) $(X2P_OBJ:s,\,\\),$(@:s,\,\\),,$(LIBFILES),) + @$(mktmp c0x32$(o) $(X2P_OBJ:s,\,$B,),$(@:s,\,$B,),,$(LIBFILES),) .ELIF "$(CCTYPE)" == "GCC" $(LINK32) -v -o $@ $(BLINK_FLAGS) \ - $(mktmp $(LKPRE) $(X2P_OBJ:s,\,\\) $(LIBFILES) $(LKPOST)) + $(mktmp $(LKPRE) $(X2P_OBJ:s,\,$B,) $(LIBFILES) $(LKPOST)) .ELSE $(LINK32) -subsystem:console -out:$@ \ - @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(X2P_OBJ:s,\,\\)) + @$(mktmp $(BLINK_FLAGS) $(LIBFILES) $(X2P_OBJ:s,\,$B,)) .ENDIF perlmain.c : runperl.c @@ -1123,8 +1123,8 @@ perlmain$(o) : perlmain.c $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) .IF "$(CCTYPE)" == "BORLAND" $(LINK32) -Tpe -ap $(BLINK_FLAGS) \ - @$(mktmp c0x32$(o) $(PERLEXE_OBJ:s,\,\\)\n \ - $(@:s,\,\\),\n \ + @$(mktmp c0x32$(o) $(PERLEXE_OBJ:s,\,$B,)\n \ + $(@:s,\,$B,),\n \ $(PERLIMPLIB) $(LIBFILES)\n) .ELIF "$(CCTYPE)" == "GCC" $(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \ |