diff options
| author | Steve Hay <SteveHay@planit.com> | 2008-02-22 18:10:36 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2008-02-22 18:10:36 +0000 |
| commit | 76febb1c6159d7a2abca9c4d1c972d95ef5258bc (patch) | |
| tree | 2f71d867884d3fec3ffc9b25423abede8897cd05 | |
| parent | f7e8b52a895af879b5e32567a5597aeb7217c590 (diff) | |
| download | perl-76febb1c6159d7a2abca9c4d1c972d95ef5258bc.tar.gz | |
Fix-up Win32's regen_config_h targets for semi-automatic updating of
the win32/config_H.* files
p4raw-id: //depot/perl@33349
| -rw-r--r-- | win32/Makefile | 20 | ||||
| -rw-r--r-- | win32/makefile.mk | 20 |
2 files changed, 23 insertions, 17 deletions
diff --git a/win32/Makefile b/win32/Makefile index d072289234..35aa45279f 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -881,18 +881,22 @@ config.w32 : $(CFGSH_TMPL) ..\config.sh : config.w32 $(MINIPERL) config_sh.PL $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) config.w32 > ..\config.sh -# this target is for when changes to the main config.sh happen -# edit config.{b,v,g}c and make this target once for each supported -# compiler (e.g. `nmake CCTYPE=BORLAND regen_config_h`) +# this target is for when changes to the main config.sh happen. +# edit config.vc, then make perl in a minimal configuration (i.e. with MULTI, +# ITHREADS, IMP_SYS, LARGE_FILES, PERLIO and CRYPT off), then make this target +# to regenerate config_H.vc. +# repeat for config.vc64 and config_H.vc64 if you have a suitable build +# environment, otherwise hand-edit them to maintain the same differences with +# config.vc and config_H.vc as before. +# unfortunately, some further manual editing is also then required to restore all +# the special __GNUC__ handling that is otherwise lost. regen_config_h: - perl config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh + $(MINIPERL) -I..\lib config_sh.PL $(CFG_VARS) $(CFGSH_TMPL) > ..\config.sh cd .. - -del /f perl.exe perl*.dll - perl configpm + miniperl configpm cd win32 -del /f $(CFGH_TMPL) - -mkdir $(COREDIR) - -perl config_h.PL "INST_VER=$(INST_VER)" + -$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)" rename config.h $(CFGH_TMPL) $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl diff --git a/win32/makefile.mk b/win32/makefile.mk index 5a0e0208c7..3ef3d0ba07 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1130,18 +1130,20 @@ config.w32 : $(CFGSH_TMPL) $(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file \ $(mktmp $(CFG_VARS)) config.w32 > ..\config.sh -# this target is for when changes to the main config.sh happen -# edit config.{b,v,g}c and make this target once for each supported -# compiler (e.g. `dmake CCTYPE=BORLAND regen_config_h`) +# this target is for when changes to the main config.sh happen. +# edit config.gc, then make perl using GCC in a minimal configuration (i.e. +# with MULTI, ITHREADS, IMP_SYS, LARGE_FILES, PERLIO and CRYPT off), then make +# this target to regenerate config_H.gc. +# unfortunately, some further manual editing is also then required to restore all +# the special _MSC_VER handling that is otherwise lost. +# repeat for config.bc and config_H.bc (using BORLAND), except that there is no +# _MSC_VER stuff in that case. regen_config_h: - perl config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \ + $(MINIPERL) -I..\lib config_sh.PL --cfgsh-option-file $(mktmp $(CFG_VARS)) \ $(CFGSH_TMPL) > ..\config.sh - -cd .. && del /f perl.exe - -cd .. && del /f perl*.dll - cd .. && perl configpm + cd .. && miniperl configpm -del /f $(CFGH_TMPL) - -mkdir $(COREDIR) - -perl config_h.PL "INST_VER=$(INST_VER)" + -$(MINIPERL) -I..\lib config_h.PL "INST_VER=$(INST_VER)" rename config.h $(CFGH_TMPL) $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl |