diff options
author | Reini Urban <rurban@cpan.org> | 2017-03-12 12:28:31 +0100 |
---|---|---|
committer | Tony Cook <tony@develop-help.com> | 2018-02-08 13:58:07 +1100 |
commit | e58927f47bb258d883cd9745f3aae46034efb2cd (patch) | |
tree | 2ef6f4a94e13c9529591ea14dfa6df4882fa58d9 /win32 | |
parent | fda9c55cee596a44d14bebb0d70550a7c73d39c7 (diff) | |
download | perl-e58927f47bb258d883cd9745f3aae46034efb2cd.tar.gz |
Storable: various core fixups: $PERL,libpth,getcwd
stacksize needs to run perl, not miniperl,
but the chdir broke $^X (a relative path).
Quote $^X only with whitespace.
Set LD_LIBRARY_PATH with a shared libperl.
Support a --core argument to stacksize.
Probe it twice.
(cherry picked from commit 0df5d8e463b9b5cfe14f9c235191fd3e5e4013a4)
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile | 3 | ||||
-rw-r--r-- | win32/Makefile.ce | 3 | ||||
-rw-r--r-- | win32/makefile.mk | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/win32/Makefile b/win32/Makefile index 2a6d5d7bb8..ff7c4e671a 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1228,8 +1228,7 @@ Extensions_realclean: PostExt: rebuild_storable rebuild_storable: $(PERLEXE) - @set PERL_CORE=1 - $(PERLEXE) -I..\lib -I. ..\dist\Storable\stacksize + $(PERLEXE) -I..\lib -I. ..\dist\Storable\stacksize --core cd ..\dist\Storable $(MAKE) PERL_CORE=1 cd ..\..\win32 diff --git a/win32/Makefile.ce b/win32/Makefile.ce index 9800b2aab6..31c54ce900 100644 --- a/win32/Makefile.ce +++ b/win32/Makefile.ce @@ -860,8 +860,7 @@ Extensions_clean: PostExt: rebuild_storable rebuild_storable: $(PERLEXE) - @set PERL_CORE=1 - $(PERLEXE) -I..\lib -I. ..\dist\Storable\stacksize + $(PERLEXE) -I..\lib -I. ..\dist\Storable\stacksize --core cd ..\dist\Storable $(MAKE) PERL_CORE=1 cd ..\..\win32 diff --git a/win32/makefile.mk b/win32/makefile.mk index 5b50b3f40a..ea22cace8d 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1551,10 +1551,8 @@ rebasePE : Extensions $(PERLDLL) Extensions_normalize $(PERLEXE) PostExt PostExt: rebuild_storable rebuild_storable: $(PERLEXE) - set PERL_CORE=1 && \ - $(PERLEXE) -I..\lib -I. ..\dist\Storable\stacksize + $(PERLEXE) -I..\lib -I. ..\dist\Storable\stacksize --core cd ..\dist\Storable && $(MAKE) PERL_CORE=1 - cd ..\..\win32 #------------------------------------------------------------------------------- |