Skip to content

Commit c8c7a6f

Browse files
committed
Seems that we have got the meta-objects and setting reified into the wrong levels of the bootstrap. :/ As a first step, this fixes up the Makefile dependencies, but it's probably not enough.
1 parent d17eb00 commit c8c7a6f

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

build/Makefile.in

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,31 @@ $(STAGE0_PBCS): $(DYNEXT_TARGET) $(STAGE0_SOURCES)
256256

257257
$(STAGE1): $(STAGE1_PBCS)
258258

259+
$(STAGE1)/$(NQP_MO_PBC): $(STAGE0_PBCS) $(NQP_MO_SOURCES)
260+
$(MKPATH) $(STAGE1)/gen
261+
$(PERL) build/gen_how_pm.pl $(NQP_MO_SOURCES) > $(STAGE1)/$(NQP_MO_COMBINED)
262+
$(PARROT) --library=$(STAGE0) $(STAGE0)/$(NQP_PBC) \
263+
--target=pir --output=$(STAGE1)/$(NQP_MO_PIR) \
264+
--setting=NULL $(STAGE1)/$(NQP_MO_COMBINED)
265+
$(PARROT) --include=$(STAGE1) -o $(STAGE1)/$(NQP_MO_PBC) \
266+
$(STAGE1)/$(NQP_MO_PIR)
267+
268+
$(STAGE1)/$(CORE_SETTING_PBC): $(STAGE0_PBCS) $(STAGE1)/$(NQP_MO_PBC) $(CORE_SETTING_SOURCES)
269+
$(MKPATH) $(STAGE1)/gen
270+
$(PERL) build/gen_setting.pl $(CORE_SETTING_SOURCES) > $(STAGE1)/$(CORE_SETTING_NQP)
271+
$(PARROT) --library=$(STAGE0) $(STAGE0)/$(NQP_PBC) \
272+
--target=pir --output=$(STAGE1)/$(CORE_SETTING_PIR) \
273+
--setting=NULL $(STAGE1)/$(CORE_SETTING_NQP)
274+
$(PARROT) -o $(STAGE1)/$(CORE_SETTING_PBC) $(STAGE1)/$(CORE_SETTING_PIR)
275+
259276
$(STAGE1)/$(SETTING_MANAGER_PBC): $(STAGE0_PBCS) src/HLL/SettingManager.pm
260277
$(PARROT) --library=$(STAGE0) $(STAGE0)/$(NQP_PBC) \
261278
--target=pir --output=$(STAGE1)/gen/setting_manager.pir \
262279
--setting=NULL src/HLL/SettingManager.pm
263280
$(PARROT) --include=$(STAGE1) -o $(STAGE1)/$(SETTING_MANAGER_PBC) \
264281
$(STAGE1)/gen/setting_manager.pir
265282

266-
$(STAGE1)/$(HLL_PBC): $(STAGE0_PBCS) $(HLL_SOURCES)
283+
$(STAGE1)/$(HLL_PBC): $(STAGE0_PBCS) $(STAGE1)/$(CORE_SETTING_PBC) $(HLL_SOURCES)
267284
$(MKPATH) $(STAGE1)/gen
268285
$(PARROT) --library=$(STAGE0) $(STAGE0)/$(NQP_PBC) \
269286
--target=pir --output=$(STAGE1)/$(HLLGRAMMAR_G) \
@@ -283,7 +300,7 @@ $(STAGE1)/$(HLL_PBC): $(STAGE0_PBCS) $(HLL_SOURCES)
283300
$(PARROT) --include=$(STAGE1) -o $(STAGE1)/$(HLL_PBC) \
284301
src/HLL.pir
285302

286-
$(STAGE1)/$(P6REGEX_PBC): $(STAGE0_PBCS) $(P6REGEX_SOURCES)
303+
$(STAGE1)/$(P6REGEX_PBC): $(STAGE0_PBCS) $(STAGE1)/$(CORE_SETTING_PBC) $(P6REGEX_SOURCES)
287304
$(MKPATH) $(STAGE1)/gen
288305
$(PARROT) --library=$(STAGE0) $(STAGE0)/$(NQP_PBC) \
289306
--target=pir --output=$(STAGE1)/$(P6REGEX_G) \
@@ -297,16 +314,7 @@ $(STAGE1)/$(P6REGEX_PBC): $(STAGE0_PBCS) $(P6REGEX_SOURCES)
297314
$(PARROT) --include=$(STAGE1) -o $(STAGE1)/$(P6REGEX_PBC) \
298315
src/Regex/P6Regex.pir
299316

300-
$(STAGE1)/$(NQP_MO_PBC): $(STAGE0_PBCS) $(NQP_MO_SOURCES)
301-
$(MKPATH) $(STAGE1)/gen
302-
$(PERL) build/gen_how_pm.pl $(NQP_MO_SOURCES) > $(STAGE1)/$(NQP_MO_COMBINED)
303-
$(PARROT) --library=$(STAGE0) $(STAGE0)/$(NQP_PBC) \
304-
--target=pir --output=$(STAGE1)/$(NQP_MO_PIR) \
305-
--setting=NULL $(STAGE1)/$(NQP_MO_COMBINED)
306-
$(PARROT) --include=$(STAGE1) -o $(STAGE1)/$(NQP_MO_PBC) \
307-
$(STAGE1)/$(NQP_MO_PIR)
308-
309-
$(STAGE1)/$(NQP_PBC): $(STAGE0_PBCS) $(NQP_SOURCES)
317+
$(STAGE1)/$(NQP_PBC): $(STAGE0_PBCS) $(STAGE1)/$(CORE_SETTING_PBC) $(NQP_SOURCES)
310318
$(MKPATH) $(STAGE1)/gen
311319
$(PARROT) --library=$(STAGE0) $(STAGE0)/$(NQP_PBC) \
312320
--target=pir --output=$(STAGE1)/$(NQP_G) \
@@ -320,24 +328,33 @@ $(STAGE1)/$(NQP_PBC): $(STAGE0_PBCS) $(NQP_SOURCES)
320328
$(PARROT) --include=$(STAGE1) -o $(STAGE1)/$(NQP_PBC) \
321329
src/NQP/Compiler.pir
322330

323-
$(STAGE1)/$(CORE_SETTING_PBC): $(STAGE0_PBCS) $(CORE_SETTING_SOURCES)
324-
$(MKPATH) $(STAGE1)/gen
325-
$(PERL) build/gen_setting.pl $(CORE_SETTING_SOURCES) > $(STAGE1)/$(CORE_SETTING_NQP)
326-
$(PARROT) --library=$(STAGE0) $(STAGE0)/$(NQP_PBC) \
327-
--target=pir --output=$(STAGE1)/$(CORE_SETTING_PIR) \
328-
--setting=NULL $(STAGE1)/$(CORE_SETTING_NQP)
329-
$(PARROT) -o $(STAGE1)/$(CORE_SETTING_PBC) $(STAGE1)/$(CORE_SETTING_PIR)
330-
331331
$(STAGE2): $(STAGE2_PBCS)
332332

333+
$(STAGE2)/$(NQP_MO_PBC): $(STAGE1_PBCS) $(NQP_MO_SOURCES)
334+
$(MKPATH) $(STAGE2)/gen
335+
$(PERL) build/gen_how_pm.pl $(NQP_MO_SOURCES) > $(STAGE2)/$(NQP_MO_COMBINED)
336+
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
337+
--target=pir --output=$(STAGE2)/$(NQP_MO_PIR) \
338+
--setting=NULL $(STAGE2)/$(NQP_MO_COMBINED)
339+
$(PARROT) --include=$(STAGE2) -o $(STAGE2)/$(NQP_MO_PBC) \
340+
$(STAGE2)/$(NQP_MO_PIR)
341+
342+
$(STAGE2)/$(CORE_SETTING_PBC): $(STAGE1_PBCS) $(STAGE2)/$(NQP_MO_PBC) $(CORE_SETTING_SOURCES)
343+
$(MKPATH) $(STAGE2)/gen
344+
$(PERL) build/gen_setting.pl $(CORE_SETTING_SOURCES) > $(STAGE2)/$(CORE_SETTING_NQP)
345+
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
346+
--target=pir --output=$(STAGE2)/$(CORE_SETTING_PIR) \
347+
--setting=NULL $(STAGE2)/$(CORE_SETTING_NQP)
348+
$(PARROT) -o $(STAGE2)/$(CORE_SETTING_PBC) $(STAGE2)/$(CORE_SETTING_PIR)
349+
333350
$(STAGE2)/$(SETTING_MANAGER_PBC): $(STAGE1_PBCS) src/HLL/SettingManager.pm
334351
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
335352
--target=pir --output=$(STAGE2)/gen/setting_manager.pir \
336353
--setting=NULL src/HLL/SettingManager.pm
337354
$(PARROT) --include=$(STAGE2) -o $(STAGE2)/$(SETTING_MANAGER_PBC) \
338355
$(STAGE2)/gen/setting_manager.pir
339356

340-
$(STAGE2)/$(HLL_PBC): $(STAGE1_PBCS) $(HLL_SOURCES)
357+
$(STAGE2)/$(HLL_PBC): $(STAGE1_PBCS) $(STAGE2)/$(CORE_SETTING_PBC) $(HLL_SOURCES)
341358
$(MKPATH) $(STAGE2)/gen
342359
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
343360
--target=pir --output=$(STAGE2)/$(HLLGRAMMAR_G) \
@@ -357,7 +374,7 @@ $(STAGE2)/$(HLL_PBC): $(STAGE1_PBCS) $(HLL_SOURCES)
357374
$(PARROT) --include=$(STAGE2) -o $(STAGE2)/$(HLL_PBC) \
358375
src/HLL.pir
359376

360-
$(STAGE2)/$(P6REGEX_PBC): $(STAGE1_PBCS) $(P6REGEX_SOURCES)
377+
$(STAGE2)/$(P6REGEX_PBC): $(STAGE1_PBCS) $(STAGE2)/$(CORE_SETTING_PBC) $(P6REGEX_SOURCES)
361378
$(MKPATH) $(STAGE2)/gen
362379
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
363380
--target=pir --output=$(STAGE2)/$(P6REGEX_G) \
@@ -371,16 +388,7 @@ $(STAGE2)/$(P6REGEX_PBC): $(STAGE1_PBCS) $(P6REGEX_SOURCES)
371388
$(PARROT) --include=$(STAGE2) -o $(STAGE2)/$(P6REGEX_PBC) \
372389
src/Regex/P6Regex.pir
373390

374-
$(STAGE2)/$(NQP_MO_PBC): $(STAGE1_PBCS) $(NQP_MO_SOURCES)
375-
$(MKPATH) $(STAGE2)/gen
376-
$(PERL) build/gen_how_pm.pl $(NQP_MO_SOURCES) > $(STAGE2)/$(NQP_MO_COMBINED)
377-
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
378-
--target=pir --output=$(STAGE2)/$(NQP_MO_PIR) \
379-
--setting=NULL $(STAGE2)/$(NQP_MO_COMBINED)
380-
$(PARROT) --include=$(STAGE2) -o $(STAGE2)/$(NQP_MO_PBC) \
381-
$(STAGE2)/$(NQP_MO_PIR)
382-
383-
$(STAGE2)/$(NQP_PBC): $(STAGE1_PBCS) $(NQP_SOURCES)
391+
$(STAGE2)/$(NQP_PBC): $(STAGE1_PBCS) $(STAGE2)/$(CORE_SETTING_PBC) $(NQP_SOURCES)
384392
$(MKPATH) $(STAGE2)/gen
385393
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
386394
--target=pir --output=$(STAGE2)/$(NQP_G) \
@@ -394,14 +402,6 @@ $(STAGE2)/$(NQP_PBC): $(STAGE1_PBCS) $(NQP_SOURCES)
394402
$(PARROT) --include=$(STAGE2) -o $(STAGE2)/$(NQP_PBC) \
395403
src/NQP/Compiler.pir
396404

397-
$(STAGE2)/$(CORE_SETTING_PBC): $(STAGE1_PBCS) $(CORE_SETTING_SOURCES)
398-
$(MKPATH) $(STAGE2)/gen
399-
$(PERL) build/gen_setting.pl $(CORE_SETTING_SOURCES) > $(STAGE2)/$(CORE_SETTING_NQP)
400-
$(PARROT) --library=$(STAGE1) $(STAGE1)/$(NQP_PBC) \
401-
--target=pir --output=$(STAGE2)/$(CORE_SETTING_PIR) \
402-
--setting=NULL $(STAGE2)/$(CORE_SETTING_NQP)
403-
$(PARROT) -o $(STAGE2)/$(CORE_SETTING_PBC) $(STAGE2)/$(CORE_SETTING_PIR)
404-
405405
$(ALL_PBCS): $(REGEX_PBC) $(STAGE2_PBCS)
406406
$(CP) $(STAGE2)/$(SETTING_MANAGER_PBC) .
407407
$(CP) $(STAGE2)/$(HLL_PBC) .

0 commit comments

Comments
 (0)