Make the JVM build and run again.

rakudo · Mar 20, 2019 · ab96f1a · ab96f1a
1 parent 2c9c823
commit ab96f1a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/main.nqp b/src/main.nqp
@@ -4,13 +4,20 @@ use Perl6::Compiler;
 
 # Determine Perl6 and NQP dirs.
 my $sep := nqp::backendconfig()<osname> eq 'MSWin32' ?? '\\' !! '/';
+#?if jvm
+my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname');
+my $exec-dir := nqp::substr($execname, 0, nqp::rindex($execname, $sep));
+#?endif
+#?if !jvm
 my $exec-dir := nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
+#?endif
+
 my $perl6-home := nqp::getenvhash()<PERL6_HOME> // $exec-dir ~ '/../share/perl6';
-if (nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep) {
+if nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep {
     $perl6-home := nqp::substr($perl6-home, 0, nqp::chars($perl6-home) - 1);
 }
 my $nqp-home := nqp::getenvhash()<NQP_HOME> // $exec-dir ~ '/../share/nqp';
-if (nqp::substr($nqp-home, nqp::chars($nqp-home) - 1) eq $sep) {
+if nqp::substr($nqp-home, nqp::chars($nqp-home) - 1) eq $sep {
     $nqp-home := nqp::substr($nqp-home, 0, nqp::chars($nqp-home) - 1);
 }
 nqp::bindhllsym('perl6', '$PERL6_HOME', $perl6-home);

diff --git a/src/perl6-debug.nqp b/src/perl6-debug.nqp
@@ -447,7 +447,13 @@ class Perl6::Debugger is Perl6::Compiler {
 sub MAIN(*@ARGS) {
     # Determine Perl6 and NQP dirs.
     my $sep := nqp::backendconfig()<osname> eq 'MSWin32' ?? '\\' !! '/';
+#?if jvm
+    my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname');
+    my $exec-dir := nqp::substr($execname, 0, nqp::rindex($execname, $sep));
+#?endif
+#?if !jvm
     my $exec-dir := nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
+#?endif
     my $perl6-home := nqp::getenvhash()<PERL6_HOME> // $exec-dir ~ '/../share/perl6';
     if (nqp::substr($perl6-home, nqp::chars($perl6-home) - 1) eq $sep) {
         $perl6-home := nqp::substr($perl6-home, 0, nqp::chars($perl6-home) - 1);

diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -13,8 +13,8 @@ J_LIBPATH = @nqp::libdir@
 NQP_JARS = @nqp_jars@
 BLD_NQP_JARS = @bld_nqp_jars@
 
-J_RUN_NQP_RR = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp .@cpsep@$(BLD_NQP_JARS)@cpsep@rakudo-runtime.jar@cpsep@$(SYSROOT)@nqp_classpath@ nqp
-J_RUN_PERL6 = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp .@cpsep@$(BLD_NQP_JARS)@cpsep@rakudo-runtime.jar@cpsep@perl6.jar@cpsep@$(SYSROOT)@nqp_classpath@ perl6
+J_RUN_NQP_RR = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp ./blib@cpsep@$(BLD_NQP_JARS)@cpsep@rakudo-runtime.jar@cpsep@$(SYSROOT)@nqp_classpath@ nqp
+J_RUN_PERL6 = $(JAVA) -Xss1m -Xms500m -Xmx3000m -cp ./blib@cpsep@$(BLD_NQP_JARS)@cpsep@rakudo-runtime.jar@cpsep@perl6.jar@cpsep@$(SYSROOT)@nqp_classpath@ perl6
 
 RUNTIME_JAVAS = src/vm/jvm/runtime/org/perl6/rakudo/*.java