diff options
| author | Nicholas Clark <nick@ccl4.org> | 2009-09-15 14:56:44 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2009-09-15 14:56:44 +0100 |
| commit | 87e064040e3ca3b6e8dfae243dfe4af76c7eb323 (patch) | |
| tree | a1b84dd7e81d6cc9d38ef29452df1b77bdcff653 | |
| parent | 404ad9dc9dfa2116d2907212d3650df6870ff9bc (diff) | |
| download | perl-87e064040e3ca3b6e8dfae243dfe4af76c7eb323.tar.gz | |
Ensure that the perl build doesn't read any installed sitecustomize script.
But not the tests yet.
We need to avoid running a sitecustomize script as it may have side effects
that cause the build to fail, or worse, complete but with buggy side effects.
| -rw-r--r-- | Makefile.SH | 2 | ||||
| -rw-r--r-- | perl.c | 2 | ||||
| -rw-r--r-- | vms/descrip_mms.template | 2 | ||||
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/makefile.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.SH b/Makefile.SH index 83f1ad1e5f..58c4449370 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -982,7 +982,7 @@ uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) # But also this ensures that all extensions are built before we try to scan # them, which picks up Devel::PPPort's documentation. pod/perltoc.pod: $(perltoc_pod_prereqs) perl$(EXE_EXT) $(ext) pod/buildtoc - $(LDLIBPTH) $(RUN) ./perl$(EXE_EXT) -Ilib pod/buildtoc --build-toc -q + $(LDLIBPTH) $(RUN) ./perl$(EXE_EXT) -f -Ilib pod/buildtoc --build-toc -q pod/perlapi.pod pod/perlintern.pod: miniperl$(EXE_EXT) autodoc.pl embed.fnc $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib autodoc.pl @@ -1940,7 +1940,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) } } -#ifdef USE_SITECUSTOMIZE +#if defined(USE_SITECUSTOMIZE) && !defined(PERL_IS_MINIPERL) if (!minus_f) { /* SITELIB_EXP is a function call on Win32. The games with local $! are to avoid setting errno if there is no diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index 747aeac293..f55ef18f60 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -448,7 +448,7 @@ pod = $(pod0) $(pod1) $(pod2) $(pod3) $(pod4) $(pod5) $(pod6) $(pod7) $(pod8) $( [.pod]perltoc.pod : [.pod]perldelta.pod [.pod]perlapi.pod [.pod]perlintern.pod [.pod]perlmodlib.pod extra.pods $(PERL_EXE) @ define/user_mode $(DBG)PERLSHR SYS$DISK:[]$(DBG)perlshr$(E) - $(PERL) [.pod]buildtoc "-q" "--build-toc" + $(PERL) "-f" [.pod]buildtoc "-q" "--build-toc" archcorefiles : $(ac) $(ARCHAUTO)time.stamp @ $(NOOP) diff --git a/win32/Makefile b/win32/Makefile index 9f6fa3d880..d4eb178f86 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1145,7 +1145,7 @@ utils: $(PERLEXE) $(X2P) $(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q ..\pod\perltoc.pod: $(PERLEXE) Extensions Extensions_nonxs - $(PERLEXE) ..\pod\buildtoc --build-toc -q + $(PERLEXE) -f ..\pod\buildtoc --build-toc -q # Note that the pod cleanup in this next section is parsed (and regenerated # by pod/buildtoc so please check that script before making changes here diff --git a/win32/makefile.mk b/win32/makefile.mk index e9f54ad70d..a4dc36ab3a 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1470,7 +1470,7 @@ utils: $(PERLEXE) $(X2P) $(PERLEXE) $(ICWD) ..\pod\perlmodlib.pl -q ..\pod\perltoc.pod: $(PERLEXE) Extensions Extensions_nonxs - $(PERLEXE) ..\pod\buildtoc --build-toc -q + $(PERLEXE) -f ..\pod\buildtoc --build-toc -q # Note that the pod cleanup in this next section is parsed (and regenerated # by pod/buildtoc so please check that script before making changes here |