Sort out use of runner_suffix

rakudo · Sep 6, 2019 · 78bc07c · 78bc07c
1 parent ca8db0e
commit 78bc07c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/tools/templates/Makefile-backend-common.in b/tools/templates/Makefile-backend-common.in
@@ -14,6 +14,9 @@
 @make_pp_pfx@ifndef @bpv(NQP_FLAGS)@
 @bpv(NQP_FLAGS)@ = --module-path=blib
 @make_pp_pfx@endif
+@make_pp_pfx@ifndef @bpv(RUNNER_SUFFIX)@
+@bpv(RUNNER_SUFFIX)@ = @runner_suffix@
+@make_pp_pfx@endif
 @bpv(LIBDIR)@ = @nfp($(PERL6_HOME)/lib)@
 
 # files we create

diff --git a/tools/templates/jvm/Makefile.in b/tools/templates/jvm/Makefile.in
@@ -7,8 +7,6 @@ NQP_PREFIX  = @nqp_prefix@
 @bpv(NQP_RR)@    = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp @q(@nfp(./blib)@@cpsep@@nop($(BLD_NQP_JARS))@@cpsep@rakudo-runtime.jar@cpsep@@nop($(SYSROOT))@@abs2rel(@nqp_classpath@)@)@ nqp
 @bpv(RUN_PERL6)@ = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp @q(@nfp(./blib)@@cpsep@@nop($(BLD_NQP_JARS))@@cpsep@rakudo-runtime.jar@cpsep@perl6.jar@cpsep@@nop($(SYSROOT))@@abs2rel(@nqp_classpath@)@)@ perl6
 
-@bpv(RUNNER_SUFFX)@ = @runner_suffix@
-
 @bpv(DEBUG_RUNNER)@ = perl6-debug-@backend_abbr@@bpm(RUNNER_SUFFIX)@
 
 NQP_JARS = @nqp_jars@

diff --git a/tools/templates/moar/Makefile.in b/tools/templates/moar/Makefile.in
@@ -13,7 +13,7 @@ MOAR        = @nfpq(@moar::bindir@/moar@moar::exe@)@
 @bpv(NQP_RR)@    = @bpm(NQP)@
 @bpv(RUN_PERL6)@ = $(MOAR) --libpath=@nfpq($(BASE_DIR)/blib)@ --libpath=@q(@bpm(NQP_LIBDIR)@)@ perl6.moarvm --nqp-lib=@nfpq($(BASE_DIR)/blib)@
 
-@bpv(RUNNER_SUFFX)@ = @moar::exe@
+@bpv(RUNNER_SUFFIX)@ = @moar::exe@
 
 R_SETTING_MOAR = RESTRICTED.setting.moarvm
 
@@ -30,7 +30,7 @@ R_SETTING_MOAR = RESTRICTED.setting.moarvm
 	@bpm(CCINC)@@nfpq(@bpm(INCPATH)@/libtommath)@ \
 	@bpm(CCINC)@@nfpq(@bpm(INCPATH)@/libuv)@
 
-@bpv(RUNNER)@ = perl6-m@moar::exe@
+#@bpv(RUNNER)@ = perl6-m@moar::exe@
 @bpv(PERL6)@ = perl6@moar::exe@
 @bpv(PERL6_DEBUG)@ = perl6-debug@moar::exe@
 @bpv(PERL6_M)@ = perl6-m@moar::exe@