Skip to content

Commit eb98cba

Browse files
committed
Stop building the now-unrequired PIR-based regex engine in stage 2, just to be sure it's not required any more.
1 parent 4b39917 commit eb98cba

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

tools/build/Makefile.in

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ CORE_SETTING_PIR = gen/NQPCORE.setting.pir
184184

185185
STAGE0_PBCS = $(STAGE0)/$(HLL_PBC) $(STAGE0)/$(P6REGEX_PBC) $(STAGE0)/$(NQP_PBC) $(STAGE0)/$(REGEX_PBC) $(STAGE0)/$(CORE_SETTING_PBC) $(STAGE0)/$(MODULE_LOADER_PBC)
186186
STAGE1_PBCS = $(STAGE1)/$(HLL_PBC) $(STAGE1)/$(P6REGEX_PBC) $(STAGE1)/$(NQP_PBC) $(STAGE1)/$(REGEX_PBC) $(STAGE1)/$(CORE_SETTING_PBC) $(STAGE1)/$(MODULE_LOADER_PBC) $(STAGE1)/$(NQP_MO_PBC) $(STAGE1)/$(QREGEX_PBC)
187-
STAGE2_PBCS = $(STAGE2)/$(HLL_PBC) $(STAGE2)/$(P6QREGEX_PBC) $(STAGE2)/$(NQP_PBC) $(STAGE2)/$(REGEX_PBC) $(STAGE2)/$(CORE_SETTING_PBC) $(STAGE2)/$(MODULE_LOADER_PBC) $(STAGE2)/$(NQP_MO_PBC) $(STAGE2)/$(QREGEX_PBC) $(STAGE2)/$(QAST_PBC)
187+
STAGE2_PBCS = $(STAGE2)/$(HLL_PBC) $(STAGE2)/$(P6QREGEX_PBC) $(STAGE2)/$(NQP_PBC) $(STAGE2)/$(CORE_SETTING_PBC) $(STAGE2)/$(MODULE_LOADER_PBC) $(STAGE2)/$(NQP_MO_PBC) $(STAGE2)/$(QREGEX_PBC) $(STAGE2)/$(QAST_PBC)
188188
ALL_PBCS = $(HLL_PBC) $(P6REGEX_PBC) $(NQP_PBC) $(CORE_SETTING_PBC) $(MODULE_LOADER_PBC) $(REGEX_PBC)
189189

190190
GROUP = nqp_group
@@ -678,10 +678,7 @@ $(STAGE2)/$(QREGEX_PBC): $(STAGE1_PBCS) $(STAGE2)/$(CORE_SETTING_PBC) $(QREGEX_S
678678
--old-regex-lib --module-path=$(STAGE2) --setting-path=$(STAGE2) $(STAGE2)/$(QREGEX_COMBINED)
679679
$(PARROT) -o $(STAGE2)/$(QREGEX_PBC) $(STAGE2)/$(QREGEX_PIR)
680680

681-
$(STAGE2)/$(REGEX_PBC): $(DYNEXT_TARGET) $(REGEX_SOURCES) $(STAGE2)/$(CORE_SETTING_PBC)
682-
$(PARROT) -o $(STAGE2)/$(REGEX_PBC) $(REGEX_SOURCES)
683-
684-
$(STAGE2)/$(HLL_PBC): $(STAGE1_PBCS) $(STAGE2)/$(REGEX_PBC) $(STAGE2)/$(CORE_SETTING_PBC) $(STAGE2)/$(QREGEX_PBC) $(QHLL_SOURCES)
681+
$(STAGE2)/$(HLL_PBC): $(STAGE1_PBCS) $(STAGE2)/$(CORE_SETTING_PBC) $(STAGE2)/$(QREGEX_PBC) $(QHLL_SOURCES)
685682
$(MKPATH) $(STAGE2)/gen
686683
$(PERL) tools/build/gen-cat.pl $(QHLL_SOURCES) > $(STAGE2)/$(HLL_COMBINED)
687684
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
@@ -722,7 +719,6 @@ $(ALL_PBCS): $(STAGE2_PBCS)
722719
$(CP) $(STAGE2)/$(MODULE_LOADER_PBC) .
723720
$(CP) $(STAGE2)/$(CORE_SETTING_PBC) .
724721
$(CP) $(STAGE2)/$(QREGEX_PBC) .
725-
$(CP) $(STAGE2)/$(REGEX_PBC) .
726722
$(CP) $(STAGE2)/$(HLL_PBC) .
727723
$(CP) $(STAGE2)/$(QAST_PBC) .
728724
$(CP) $(STAGE2)/$(P6QREGEX_PBC) .

0 commit comments

Comments
 (0)