# New Ticket Created by Nick Glencross
# Please include the string: [perl #120520]
# in the subject line of all future correspondence about this issue.
# <URL: https://rt.perl.org/Ticket/Display.html?id=120520 >
Hi all,
This patch fixes a problem where RUN_PERL6 is clashing across build
variants.
It needs applying to the moar-support branch.
Without it you can get the following, mixing up java/moar.
The following step can take a long time, please be patient.
/home/nickg/src/rakudo/../moarvm/bin/moar
--libpath="/home/nickg/src/rakudo/../moarvm/languages/nqp/lib" perl6.moarvm
--setting=NULL --optimize=3 --target=jar --stagestats
--output=CORE.setting.jar gen/jvm/CORE.setting
Unhandled exception: While looking for 'perl6.moarvm': no such file or
directory
Cheers,
Nick
>From 70b0d48c0d290442cb40f5b66b3565ca58314904 Mon Sep 17 00:00:00 2001
From: Nick Glencross <nick.glencr...@gmail.com>
Date: Tue, 12 Nov 2013 15:25:08 +0000
Subject: [PATCH] This fixes a build problem when you run Configure with
'-backends=moar,jvm'.
We make RUN_PERL6 unique to each build variant.
---
tools/build/Makefile-JVM.in | 4 ++--
tools/build/Makefile-Moar.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
index 378a2c0..a452347 100644
--- a/tools/build/Makefile-JVM.in
+++ b/tools/build/Makefile-JVM.in
@@ -12,7 +12,7 @@ PERL6_LANG_DIR = $(PREFIX)/languages/perl6
NQP_JARS = @nqp_jars@
-RUN_PERL6 = $(JAVA) -Xss1m -Xms500m -Xmx1600m
-Xbootclasspath/a:.@cpsep@$(NQP_JARS)@cp...@rakudo-runtime.jar@cp...@perl6.jar
-cp @nqp_classpath@ perl6
+J_RUN_PERL6 = $(JAVA) -Xss1m -Xms500m -Xmx1600m
-Xbootclasspath/a:.@cpsep@$(NQP_JARS)@cp...@rakudo-runtime.jar@cp...@perl6.jar
-cp @nqp_classpath@ perl6
RUNTIME_JAVAS = src/vm/jvm/runtime/org/perl6/rakudo/*.java
@@ -248,7 +248,7 @@ $(PERL6_B_JAR): $(BOOTSTRAP_SOURCES) $(PERL6_M_JAR)
$(SETTING_JAR): $(PERL6_JAR) $(PERL6_B_JAR) $(J_CORE_SOURCES)
$(PERL) $(J_GEN_CAT) $(J_CORE_SOURCES) > $(J_BUILD_DIR)/CORE.setting
@echo "The following step can take a long time, please be patient."
- $(RUN_PERL6) --setting=NULL --optimize=3 --target=jar --stagestats
--output=$(SETTING_JAR) $(J_BUILD_DIR)/CORE.setting
+ $(J_RUN_PERL6) --setting=NULL --optimize=3 --target=jar --stagestats
--output=$(SETTING_JAR) $(J_BUILD_DIR)/CORE.setting
$(RUNNER):
$(PERL) tools/build/create-jvm-runner.pl dev . . $(NQP_PREFIX)
$(NQP_JARS)
diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
index 7da39a1..2983401 100644
--- a/tools/build/Makefile-Moar.in
+++ b/tools/build/Makefile-Moar.in
@@ -11,7 +11,7 @@ PREFIX = @prefix@
MOAR = $(PREFIX)@slash@bin@slash@moar@exe@
M_NQP = $(PREFIX)@slash@bin@slash@nqp-m@runner_suffix@
-RUN_PERL6 = $(MOAR) --libpath="$(PREFIX)@slash@languages@slash@nqp@slash@lib"
perl6.moarvm
+M_RUN_PERL6 = $(MOAR)
--libpath="$(PREFIX)@slash@languages@slash@nqp@slash@lib" perl6.moarvm
M_RUNNER = perl6-m@runner_suffix@
@@ -244,7 +244,7 @@ $(PERL6_B_MOAR): $(BOOTSTRAP_SOURCES) $(PERL6_M_MOAR)
$(SETTING_MOAR): $(PERL6_MOAR) $(PERL6_B_MOAR) $(M_CORE_SOURCES)
$(PERL) $(M_GEN_CAT) $(M_CORE_SOURCES) > src/gen/m-CORE.setting
@echo "The following step can take a long time, please be patient."
- $(RUN_PERL6) --setting=NULL --optimize=3 --target=mbc --stagestats
--output=$(SETTING_MOAR) src/gen/m-CORE.setting
+ $(M_RUN_PERL6) --setting=NULL --optimize=3 --target=mbc --stagestats
--output=$(SETTING_MOAR) src/gen/m-CORE.setting
$(M_RUNNER): tools/build/gen-moar-runner.pl $(PERL6_MOAR)
$(PERL) tools/build/gen-moar-runner.pl $(MOAR) .
--
1.8.3.2
