summaryrefslogtreecommitdiff
path: root/win32/Makefile
diff options
context:
space:
mode:
authorReini Urban <rurban@cpan.org>2017-03-10 10:59:53 +0100
committerTony Cook <tony@develop-help.com>2018-02-08 13:58:06 +1100
commitfda9c55cee596a44d14bebb0d70550a7c73d39c7 (patch)
tree2b9d795168f46ae97a22fe002cd9900c8dbca451 /win32/Makefile
parentdd7f75e0fb1d13de11fce9eb3ae22723df606286 (diff)
downloadperl-fda9c55cee596a44d14bebb0d70550a7c73d39c7.tar.gz
Storable: core Makefile.SH support
redo building Storable after perl was built, with the probed stacksize.h values. We can only produce stacksize.h with a PERL_EXE so we have to do it twice. TonyC: - this fixes the stack overflow iff the rebuild_storable target runs after storable is built, but there's nothing preventing lib/auto/Storable/Storable.so being built *after* rebuild_storable in a parallel build at this point. - It's also possible for both the lib/...Storable.so target and the rebuild_storable target to run at the same time, possibly corrupting the generated binary (check 4d106cc5 for ext/SDBM_File for example) Conflicts: .git-rr-cache pod/perlcdelta.pod win32/Makefile.ce
Diffstat (limited to 'win32/Makefile')
-rw-r--r--win32/Makefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/win32/Makefile b/win32/Makefile
index d51363358a..2a6d5d7bb8 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -939,7 +939,8 @@ CFG_VARS = \
#
all : .\config.h ..\git_version.h $(GLOBEXE) $(CONFIGPM) \
- $(UNIDATAFILES) MakePPPort $(PERLEXE) Extensions_nonxs Extensions $(PERLSTATIC)
+ $(UNIDATAFILES) MakePPPort $(PERLEXE) Extensions_nonxs Extensions PostExt \
+ $(PERLSTATIC)
@echo Everything is up to date. '$(MAKE_BARE) test' to run test suite.
regnodes : ..\regnodes.h
@@ -1224,6 +1225,15 @@ 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: rebuild_storable
+
+rebuild_storable: $(PERLEXE)
+ @set PERL_CORE=1
+ $(PERLEXE) -I..\lib -I. ..\dist\Storable\stacksize
+ cd ..\dist\Storable
+ $(MAKE) PERL_CORE=1
+ cd ..\..\win32
+
#-------------------------------------------------------------------------------
doc: $(PERLEXE) ..\pod\perltoc.pod