@@ -130,7 +130,9 @@ STAGE2_OUTPUT = $(STAGE2)/$(NQP_MO_MOAR) $(STAGE2)/$(MODULE_LOADER_MOAR) \
130
130
$(STAGE2)/$(QAST_MOAR) $(STAGE2)/$(P6QREGEX_MOAR) \
131
131
$(STAGE2)/$(NQP_MOAR)
132
132
133
- all: $(NQP_MOAR) $(P5QREGEX_MOAR)
133
+ RUNNER = @runner@
134
+
135
+ all: $(NQP_MOAR) $(RUNNER) $(P5QREGEX_MOAR)
134
136
135
137
clean:
136
138
$(PERL) -MExtUtils::Command -e rm_rf *.moarvm src/stage1 src/stage2 nqp nqp.bat
@@ -290,34 +292,37 @@ $(NQP_MOAR): $(STAGE2_OUTPUT)
290
292
$(CP) $(STAGE2)/$(P6QREGEX_MOAR) .
291
293
$(CP) $(STAGE2)/$(NQP_MOAR) .
292
294
293
- $(P5QREGEX_MOAR): $(NQP_MOAR) $(P5QREGEX_SOURCES)
295
+ $(RUNNER): tools/build/gen-moar-runner.pl
296
+ $(PERL) tools/build/gen-moar-runner.pl "$(MOAR)"
297
+
298
+ $(P5QREGEX_MOAR): $(P5QREGEX_SOURCES) $(NQP_MOAR) $(RUNNER)
294
299
$(MKPATH) $(STAGE2)/gen
295
300
$(PERL) tools/build/gen-cat.pl moar $(P5QREGEX_SOURCES) > $(STAGE2)/$(P5QREGEX_COMBINED)
296
- $(MOAR) $(NQP_MOAR ) --target=mbc --output=$(P5QREGEX_MOAR) \
301
+ $(RUNNER ) --target=mbc --output=$(P5QREGEX_MOAR) \
297
302
$(STAGE2)/$(P5QREGEX_COMBINED)
298
303
299
304
## testing
300
305
301
306
t/*/*.t: all
302
- prove -r -v --exec "$(MOAR) $(NQP_MOAR)" $@
307
+ prove -r -v --exec .@slash@$(RUNNER) $@
303
308
304
309
test: all
305
- prove -r --exec "$(MOAR) $(NQP_MOAR)" t/nqp t/qregex t/p5regex t/qast t/serialization
310
+ prove -r --exec .@slash@$(RUNNER) t/nqp t/qregex t/p5regex t/qast t/serialization
306
311
307
312
test-loud: all
308
- prove -r -v --exec "$(MOAR) $(NQP_MOAR)" t/nqp t/qregex t/p5regex t/qast t/serialization
313
+ prove -r -v --exec .@slash@$(RUNNER) t/nqp t/qregex t/p5regex t/qast t/serialization
309
314
310
315
core-test: $(RUNNER)
311
- prove -r --exec "$(MOAR) $(NQP_MOAR)" t/nqp
316
+ prove -r --exec .@slash@$(RUNNER) t/nqp
312
317
313
318
core-test-loud: $(RUNNER)
314
- prove -r -v --exec "$(MOAR) $(NQP_MOAR)" t/nqp
319
+ prove -r -v --exec .@slash@$(RUNNER) t/nqp
315
320
316
321
qregex-test: $(RUNNER)
317
- prove -r --exec "$(MOAR) $(NQP_MOAR)" t/qregex
322
+ prove -r --exec .@slash@$(RUNNER) t/qregex
318
323
319
324
qregex-test-loud: $(RUNNER)
320
- prove -r -v --exec "$(MOAR) $(NQP_MOAR)" t/qregex
325
+ prove -r -v --exec .@slash@$(RUNNER) t/qregex
321
326
322
327
# nqp::makefile <-- tells NQP::Configure to treat this file as a makefile,
323
328
# performing win32 slash and makefile conversions
0 commit comments