diff options
| author | Reini Urban <rurban@cpan.org> | 2017-03-10 10:59:53 +0100 |
|---|---|---|
| committer | Tony Cook <tony@develop-help.com> | 2018-02-08 13:58:06 +1100 |
| commit | fda9c55cee596a44d14bebb0d70550a7c73d39c7 (patch) | |
| tree | 2b9d795168f46ae97a22fe002cd9900c8dbca451 /win32/makefile.mk | |
| parent | dd7f75e0fb1d13de11fce9eb3ae22723df606286 (diff) | |
| download | perl-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.mk')
| -rw-r--r-- | win32/makefile.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index d108a9c487..5b50b3f40a 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1542,12 +1542,20 @@ Extensions_realclean : # be running in parallel like UNIDATAFILES, this target a placeholder for the # future .IF "$(BUILD_STATIC)"=="define" -rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) $(PERLEXESTATIC) +rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) PostExt $(PERLEXESTATIC) .ELSE -rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) +rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) PostExt .ENDIF $(NOOP) +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 + #------------------------------------------------------------------------------- |