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 /win32 | |
| 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 'win32')
| -rw-r--r-- | win32/Makefile | 1 | ||||
| -rw-r--r-- | win32/makefile.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/win32/Makefile b/win32/Makefile index 4897a4ad35..e66924f345 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -853,7 +853,6 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL) $(XCOPY) ..\*.h $(COREDIR)\*.* $(XCOPY) *.h $(COREDIR)\*.* - $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.* $(RCOPY) include $(COREDIR)\*.* -$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM) diff --git a/win32/makefile.mk b/win32/makefile.mk index fcc30ac473..789ecc4a09 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1155,7 +1155,6 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh config_h.PL ..\minimod.pl if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL) $(XCOPY) ..\*.h $(COREDIR)\*.* $(XCOPY) *.h $(COREDIR)\*.* - $(XCOPY) ..\ext\re\re.pm $(LIBDIR)\*.* $(RCOPY) include $(COREDIR)\*.* $(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" \ || $(MAKE) $(MAKEMACROS) $(CONFIGPM) $(MAKEFILE) |