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 /Cross | |
| 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 'Cross')
| -rw-r--r-- | Cross/Makefile-cross-SH | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Cross/Makefile-cross-SH b/Cross/Makefile-cross-SH index d1d2cbf7a1..65d496a583 100644 --- a/Cross/Makefile-cross-SH +++ b/Cross/Makefile-cross-SH @@ -717,7 +717,7 @@ fi $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: preplibrary -preplibrary: miniperl $(CONFIGPM) lib/lib.pm lib/re.pm $(PREPLIBRARY_LIBPERL) +preplibrary: miniperl $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL) .PHONY: makeppport makeppport: miniperl$(EXE_EXT) $(CONFIGPM) @@ -734,10 +734,6 @@ lib/re.pm: ext/re/re.pm @-rm -f $@ cp ext/re/re.pm lib/re.pm -lib/lib.pm: miniperl $(CONFIGPM) - @-rm -f $@ - $(LDLIBPTH) ./miniperl -Ilib -MCross lib/lib_pm.PL - lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl $(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl @@ -1193,7 +1189,7 @@ minitest.prep: # Can't depend on lib/Config.pm because that might be where miniperl # is crashing. -minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep +minitest: miniperl$(EXE_EXT) minitest.prep - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ && $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty |