diff options
| author | Tony Cook <tony@develop-help.com> | 2018-12-04 15:11:17 +1100 |
|---|---|---|
| committer | Tony Cook <tony@develop-help.com> | 2018-12-10 11:06:44 +1100 |
| commit | 2a0bbd31bbcc94c7c511f9575df619c5fdf3164c (patch) | |
| tree | b79abb6abf43e8e9e13f3f1a306ffbadb8bcfde3 /win32 | |
| parent | 2bfa63845d8b4bc38e25109386ca447586a3db26 (diff) | |
| download | perl-2a0bbd31bbcc94c7c511f9575df619c5fdf3164c.tar.gz | |
(perl #133708) remove build-time probing for stack limits for Storable
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/GNUmakefile | 12 | ||||
| -rw-r--r-- | win32/Makefile | 10 | ||||
| -rw-r--r-- | win32/makefile.mk | 15 |
3 files changed, 4 insertions, 33 deletions
diff --git a/win32/GNUmakefile b/win32/GNUmakefile index 67b980d619..b89d86f3c8 100644 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -1208,7 +1208,7 @@ CFG_VARS = \ .PHONY: all info -all : info rebasePE Extensions_nonxs $(PERLSTATIC) PostExt +all : info rebasePE Extensions_nonxs $(PERLSTATIC) info : ifeq ($(CCTYPE),GCC) @@ -1659,16 +1659,6 @@ Extensions_clean : Extensions_realclean : -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(PLMAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --all --target=realclean -PostExt : ..\lib\Storable\Limit.pm - -# we need the exe, perl(ver).dll, and the Exporter, Storable, Win32 extensions -# rebasePE most of that, including adjustment for static builds, so we -# just need non-xs extensions -..\lib\Storable\Limit.pm : rebasePE Extensions_nonxs - $(PLMAKE) -C ..\dist\Storable lib\Storable\Limit.pm - if not exist ..\lib\Storable mkdir ..\lib\Storable - copy ..\dist\Storable\lib\Storable\Limit.pm ..\lib\Storable\Limit.pm - # all PE files need to be built by the time this target runs, PP files can still # be running in parallel like UNIDATAFILES, this target a placeholder for the # future diff --git a/win32/Makefile b/win32/Makefile index 2f478ceff0..47ae6d95b9 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -955,7 +955,7 @@ CFG_VARS = \ # all : ..\git_version.h $(GLOBEXE) $(CONFIGPM) \ - $(UNIDATAFILES) MakePPPort $(PERLEXE) Extensions_nonxs Extensions PostExt \ + $(UNIDATAFILES) MakePPPort $(PERLEXE) Extensions_nonxs Extensions \ $(PERLSTATIC) @echo Everything is up to date. '$(MAKE_BARE) test' to run test suite. @@ -1244,13 +1244,6 @@ Extensions_clean: Extensions_realclean: -if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(CPANDIR) --dir=$(DISTDIR) --dir=$(EXTDIR) --all --target=realclean -PostExt: ..\lib\Storable\Limit.pm - -..\lib\Storable\Limit.pm: $(PERLEXE) Extensions - cd ..\dist\Storable && $(MAKE) lib\Storable\Limit.pm - if not exist ..\lib\Storable mkdir ..\lib\Storable - copy ..\dist\Storable\lib\Storable\Limit.pm ..\lib\Storable\Limit.pm - #------------------------------------------------------------------------------- doc: $(PERLEXE) ..\pod\perltoc.pod @@ -1329,7 +1322,6 @@ distclean: realclean -del /f $(LIBDIR)\Time\HiRes.pm -del /f $(LIBDIR)\Unicode\Normalize.pm -del /f $(LIBDIR)\Math\BigInt\FastCalc.pm - -del /f $(LIBDIR)\Storable.pm $(LIBDIR)\Storable\Limit.pm -del /f $(LIBDIR)\Win32.pm -del /f $(LIBDIR)\Win32CORE.pm -del /f $(LIBDIR)\Win32API\File.pm diff --git a/win32/makefile.mk b/win32/makefile.mk index 6c7ac8aff3..d813624810 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1181,7 +1181,7 @@ CFG_VARS = \ # Top targets # -all : CHECKDMAKE rebasePE Extensions_nonxs $(PERLSTATIC) PostExt +all : CHECKDMAKE rebasePE Extensions_nonxs $(PERLSTATIC) info : .IF "$(CCTYPE)" == "GCC" @@ -1629,17 +1629,6 @@ rebasePE : Extensions $(PERLDLL) $(NORMALIZE_DYN) $(PERLEXE) .ENDIF $(NOOP) -PostExt : ..\lib\Storable\Limit.pm - $(NOOP) - -# we need the exe, perl(ver).dll, and the Exporter, Storable, Win32 extensions -# rebasePE most of that, including adjustment for static builds, so we -# just need non-xs extensions -..\lib\Storable\Limit.pm : rebasePE Extensions_nonxs - cd ..\dist\Storable && $(MAKE) lib\Storable\Limit.pm - if not exist ..\lib\Storable mkdir ..\lib\Storable - copy ..\dist\Storable\lib\Storable\Limit.pm ..\lib\Storable\Limit.pm - #------------------------------------------------------------------------------- @@ -1714,7 +1703,7 @@ distclean: realclean -del /f $(LIBDIR)\Time\HiRes.pm -del /f $(LIBDIR)\Unicode\Normalize.pm -del /f $(LIBDIR)\Math\BigInt\FastCalc.pm - -del /f $(LIBDIR)\Storable.pm $(LIBDIR)\Storable\Limit.pm + -del /f $(LIBDIR)\Storable.pm -del /f $(LIBDIR)\Win32.pm -del /f $(LIBDIR)\Win32CORE.pm -del /f $(LIBDIR)\Win32API\File.pm |