From fad44ff7f581dd1eb4bbb02513e19c4104920395 Mon Sep 17 00:00:00 2001
From: Pawel Murias <pawelmurias@gmail.com>
Date: Sat, 3 Sep 2016 10:23:21 +0200
Subject: [PATCH] [js] Hacks for building rakudo.js untill I figure out a good
 way to build it.

---
 nqp-js                          |  3 ++-
 src/vm/js/Perl6/Ops.nqp         |  2 +-
 tools/build/gen-js-makefile.nqp | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/nqp-js b/nqp-js
index 4259c80e23a..4d2cbe79c4c 100755
--- a/nqp-js
+++ b/nqp-js
@@ -1 +1,2 @@
-node nqp-bootstrapped.js "$@"
+#node nqp-bootstrapped.js "$@"
+./node_modules/.bin/nqp-js-on-js "$@"
diff --git a/src/vm/js/Perl6/Ops.nqp b/src/vm/js/Perl6/Ops.nqp
index 610eee9941e..3923235e240 100644
--- a/src/vm/js/Perl6/Ops.nqp
+++ b/src/vm/js/Perl6/Ops.nqp
@@ -58,7 +58,7 @@ $ops.add_simple_op('p6invokeunder', $ops.OBJ, [$ops.OBJ, $ops.OBJ], :sideffects,
 });
 
 $ops.add_simple_op('p6settypes', $ops.OBJ, [$ops.OBJ], :sideffects);
-$ops.add_simple_op('p6init', $ops.OBJ, [], :sideffects, -> {'require("perl6-runtime")'});
+$ops.add_simple_op('p6init', $ops.OBJ, [], :sideffects, -> {'require(process.env.RAKUDOJS_RUNTIME)'});
 $ops.add_simple_op('p6bool', $ops.OBJ, [$ops.BOOL], :sideffects);
 
 $ops.add_simple_op('p6box_s', $ops.OBJ, [$ops.STR]);
diff --git a/tools/build/gen-js-makefile.nqp b/tools/build/gen-js-makefile.nqp
index c973b796c7c..f3abac8056c 100644
--- a/tools/build/gen-js-makefile.nqp
+++ b/tools/build/gen-js-makefile.nqp
@@ -63,18 +63,18 @@ sub combine(:$sources, :$file) {
 my $ModuleLoader-nqp := combine(:sources("src/vm/js/ModuleLoaderVMConfig.nqp src/Perl6/ModuleLoader.nqp"), :file<js-ModuleLoader.nqp>);
 
 
-my $Perl6-ModuleLoader := nqp($ModuleLoader-nqp, "$blib/Perl6/ModuleLoader.js");
-my $Perl6-Ops := nqp('src/vm/js/Perl6/Ops.nqp', "$blib/Perl6/Ops.js");
-my $Perl6-Pod := nqp('src/Perl6/Pod.nqp', "$blib/Perl6/Pod.js");
-my $Perl6-World := nqp('src/Perl6/World.nqp', "$blib/Perl6/World.js", :deps([$Perl6-Ops, $Perl6-Pod, $Perl6-ModuleLoader]));
-my $Perl6-Actions := nqp('src/Perl6/Actions.nqp', "$blib/Perl6/Actions.js", :deps([$Perl6-Ops, $Perl6-World]));
-my $Perl6-Grammar := nqp('src/Perl6/Grammar.nqp', "$blib/Perl6/Grammar.js", :deps([$Perl6-World, $Perl6-Actions, $Perl6-Pod]));
+my $Perl6-ModuleLoader := nqp($ModuleLoader-nqp, "$blib/Perl6-ModuleLoader.js");
+my $Perl6-Ops := nqp('src/vm/js/Perl6/Ops.nqp', "$blib/Perl6-Ops.js");
+my $Perl6-Pod := nqp('src/Perl6/Pod.nqp', "$blib/Perl6-Pod.js");
+my $Perl6-World := nqp('src/Perl6/World.nqp', "$blib/Perl6-World.js", :deps([$Perl6-Ops, $Perl6-Pod, $Perl6-ModuleLoader]));
+my $Perl6-Actions := nqp('src/Perl6/Actions.nqp', "$blib/Perl6-Actions.js", :deps([$Perl6-Ops, $Perl6-World]));
+my $Perl6-Grammar := nqp('src/Perl6/Grammar.nqp', "$blib/Perl6-Grammar.js", :deps([$Perl6-World, $Perl6-Actions, $Perl6-Pod]));
 
 my $Optimizer-nqp := combine(:sources("src/Perl6/Optimizer.nqp"), :file<js-Perl6-Optimizer.nqp>);
 
-my $Perl6-Optimizer := nqp($Optimizer-nqp, "$blib/Perl6/Optimizer.js", :deps([$Perl6-Ops]));
+my $Perl6-Optimizer := nqp($Optimizer-nqp, "$blib/Perl6-Optimizer.js", :deps([$Perl6-Ops]));
 
-my $Perl6-Compiler := nqp('src/Perl6/Compiler.nqp', "$blib/Perl6/Compiler.js", :deps([$Perl6-Optimizer]));
+my $Perl6-Compiler := nqp('src/Perl6/Compiler.nqp', "$blib/Perl6-Compiler.js", :deps([$Perl6-Optimizer]));
 
 my $main-version := $build_dir ~ '/main-version';
 
@@ -93,9 +93,9 @@ rule($Metamodel-combined, '$(COMMON_BOOTSTRAP_SOURCES)',
 
 my $Bootstrap-combined := combine(:sources('$(BOOTSTRAP_SOURCES)'), :file<js-Perl6-BOOTSTRAP.nqp>);
 
-my $Perl6-Metamodel := nqp($Metamodel-combined, "$blib/Perl6/Metamodel.js",  :deps([$Perl6-Ops]));
+my $Perl6-Metamodel := nqp($Metamodel-combined, "$blib/Perl6-Metamodel.js",  :deps([$Perl6-Ops]));
 
-my $Perl6-Bootstrap := nqp($Bootstrap-combined, "$blib/Perl6/BOOTSTRAP.js",  :deps([$Perl6-Metamodel]));
+my $Perl6-Bootstrap := nqp($Bootstrap-combined, "$blib/Perl6-BOOTSTRAP.js",  :deps([$Perl6-Metamodel]));
 
 #$(PERL6_G_MOAR) $(PERL6_A_MOAR) $(PERL6_C_MOAR) $(PERL6_P_MOAR)