diff options
| author | Nicholas Clark <nick@ccl4.org> | 2011-02-14 20:36:36 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2011-02-15 14:10:05 +0000 |
| commit | 7353f64c5bca6e7102582a1e0017c850930249c3 (patch) | |
| tree | 775c3f14fedba90c1dea85e06b108b1c44fec90a /vms | |
| parent | 5e4c4c91bd52a48de59520d5e9b4e3478e49c613 (diff) | |
| download | perl-7353f64c5bca6e7102582a1e0017c850930249c3.tar.gz | |
Add ext/re/re.pm to the @INC set for miniperl by lib/buildcustomize.pl
This avoids a build-time race condition where lib/re.pm might be read midway
through the *second* copy of it (when ext/re/Makefile is being run). It also
simplifies many [Mm]akefile* rules, which previously had a special case to
copy it early.
Diffstat (limited to 'vms')
| -rw-r--r-- | vms/descrip_mms.template | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index 846afa49c8..37637830a8 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -361,7 +361,7 @@ CRTLOPTS =,$(CRTL)/Options unidatadirs = lib/unicore/To lib/unicore/lib # Modules which must be installed before we can build extensions -LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]re.pm [.lib]buildcustomize.pl +LIBPREREQ = $(ARCHDIR)Config.pm $(ARCHDIR)Config_heavy.pl [.lib.VMS]Filespec.pm $(ARCHDIR)vmspipe.com [.lib]buildcustomize.pl utils1 = [.lib.pods]perldoc.com [.lib.ExtUtils]Miniperl.pm [.utils]c2ph.com [.utils]h2ph.com utils2 = [.utils]h2xs.com [.utils]libnetcfg.com [.lib]perlbug.com [.utils]dprofpp.com [.utils]json_pp.com @@ -457,9 +457,6 @@ $(PERLDELTA_CURRENT) : [.pod]perldelta.pod archcorefiles : $(ac) $(ARCHAUTO)time.stamp @ $(NOOP) -[.lib]re.pm : [.ext.re]re.pm - Copy/NoConfirm/Log $(MMS$SOURCE) [.lib] - [.lib]buildcustomize.pl : write_buildcustomize.pl $(MINIPERL_EXE) $(MINIPERL) write_buildcustomize.pl > [.lib]buildcustomize.pl @@ -1522,7 +1519,7 @@ test_harness : all [.t.lib]vmsfspec.t - @[.vms]test.com "$(E)" "$(__DEBUG__)" @ $(MINIPERL) -e "print ""Ran tests"";" > [.t]rantests. -minitest : $(MINITEST_EXE) [.lib]re.pm [.lib.VMS]Filespec.pm unidatafiles.ts +minitest : $(MINITEST_EXE) [.lib.VMS]Filespec.pm unidatafiles.ts @ PERL_TEST_DRIVER == "minitest" - @[.vms]test.com "$(E)" "$(__DEBUG__)" |