Skip to content

Commit 4b97ed3

Browse files
committed
Update bootstrap with setting loading in the compiled code.
1 parent 5cd263b commit 4b97ed3

File tree

7 files changed

+32534
-30858
lines changed

7 files changed

+32534
-30858
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ nqp_group.c
3030
nqp_group.h
3131
nqp.pbc
3232
NQPCORE.setting.pbc
33+
SettingManager.pbc
3334
src/gen/*.pir
3435
src/gen/*.nqp
3536
src/gen/*.pm

build/Makefile.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ NQP_EXE = nqp$(EXE)
138138
CORE_SETTING_PBC = NQPCORE.setting.pbc
139139
CORE_SETTING_PIR = gen/NQPCORE.setting.pir
140140

141-
STAGE0_PBCS = $(STAGE0)/$(HLL_PBC) $(STAGE0)/$(P6REGEX_PBC) $(STAGE0)/$(NQP_PBC) $(STAGE0)/$(REGEX_PBC) $(STAGE0)/$(CORE_SETTING_PBC)
141+
STAGE0_PBCS = $(STAGE0)/$(HLL_PBC) $(STAGE0)/$(P6REGEX_PBC) $(STAGE0)/$(NQP_PBC) $(STAGE0)/$(REGEX_PBC) $(STAGE0)/$(CORE_SETTING_PBC) $(STAGE0)/$(SETTING_MANAGER_PBC)
142142
STAGE1_PBCS = $(STAGE1)/$(HLL_PBC) $(STAGE1)/$(P6REGEX_PBC) $(STAGE1)/$(NQP_PBC) $(REGEX_PBC) $(STAGE1)/$(CORE_SETTING_PBC) $(STAGE1)/$(SETTING_MANAGER_PBC)
143143
STAGE2_PBCS = $(STAGE2)/$(HLL_PBC) $(STAGE2)/$(P6REGEX_PBC) $(STAGE2)/$(NQP_PBC) $(REGEX_PBC) $(STAGE2)/$(CORE_SETTING_PBC) $(STAGE2)/$(SETTING_MANAGER_PBC)
144144
ALL_PBCS = $(HLL_PBC) $(P6REGEX_PBC) $(NQP_PBC) $(CORE_SETTING_PBC) $(SETTING_MANAGER_PBC)
@@ -250,6 +250,7 @@ $(STAGE0_PBCS): $(DYNEXT_TARGET) $(STAGE0_SOURCES)
250250
$(PARROT) -o $(STAGE0)/$(P6REGEX_PBC) src/stage0/P6Regex-s0.pir
251251
$(PARROT) -o $(STAGE0)/$(NQP_PBC) src/stage0/NQP-s0.pir
252252
$(PARROT) -o $(STAGE0)/$(CORE_SETTING_PBC) src/stage0/NQPCORE.setting-s0.pir
253+
$(PARROT) -o $(STAGE0)/$(SETTING_MANAGER_PBC) src/stage0/SettingManager-s0.pir
253254

254255
$(STAGE1): $(STAGE1_PBCS)
255256

@@ -435,6 +436,7 @@ bootstrap-files: $(STAGE2_PBCS) src/stage2/$(CORE_SETTING_NQP)
435436
$(PERL) build/gen_bootstrap.pl src/Regex/P6Regex.pir >src/stage0/P6Regex-s0.pir
436437
$(PERL) build/gen_bootstrap.pl src/NQP/Compiler.pir >src/stage0/NQP-s0.pir
437438
$(PERL) build/gen_bootstrap.pl src/stage2/$(CORE_SETTING_PIR) >src/stage0/NQPCORE.setting-s0.pir
439+
$(PERL) build/gen_bootstrap.pl src/stage2/gen/setting_manager.pir >src/stage0/SettingManager-s0.pir
438440

439441

440442
## testing

0 commit comments

Comments
 (0)