Skip to content

Commit 1454654

Browse files
committed
call the gen-runner provided my moar
1 parent 7970930 commit 1454654

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/build/Makefile-Moar.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ m-install: m-all
6969
$(CP) $(P6QREGEX_MOAR) $(DESTDIR)$(NQP_LIB_DIR)
7070
$(CP) $(NQP_MOAR) $(DESTDIR)$(NQP_LIB_DIR)
7171
$(CP) $(P5QREGEX_MOAR) $(DESTDIR)$(NQP_LIB_DIR)
72-
$(PERL) tools/build/install-moar-runner.pl "$(DESTDIR)" $(PREFIX)
72+
$(PERL) $(PREFIX)/bin/gen-moar-runner.pl "$(DESTDIR)$(BIN_DIR)/nqp-m" "$(PREFIX)" "$(DESTDIR)$(NQP_LIB_DIR)/nqp.moarvm" "$(DESTDIR)$(NQP_LIB_DIR)"
7373

7474
# FIXME:
7575
M_CLEANUPS = *.moarvm gen/moar/* $(M_RUNNER)
@@ -232,8 +232,8 @@ $(NQP_MOAR): $(M_STAGE2_OUTPUT)
232232
$(CP) $(M_STAGE2)/$(P6QREGEX_MOAR) .
233233
$(CP) $(M_STAGE2)/$(NQP_MOAR) .
234234

235-
$(M_RUNNER): tools/build/gen-moar-runner.pl
236-
$(PERL) tools/build/gen-moar-runner.pl "$(MOAR)"
235+
$(M_RUNNER): $(PREFIX)/bin/gen-moar-runner.pl
236+
$(PERL) $(PREFIX)/bin/gen-moar-runner.pl "nqp-m" "$(PREFIX)" "nqp.moarvm"
237237

238238
m-runner-default: m-all
239239
$(CP) $(M_RUNNER) nqp$(BAT)

0 commit comments

Comments
 (0)