Hardcode less things while building mininqpmo.

pmurias · Dec 1, 2014 · d2fb4b8 · d2fb4b8
1 parent d212c74
commit d2fb4b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/tools/build/Makefile-JS.in b/tools/build/Makefile-JS.in
@@ -24,7 +24,7 @@ $(JS_STAGE2)/$(NQP_MO_COMBINED): $(NQP_MO_SOURCES)
 
 $(JS_STAGE2)/mininqpmo.moarvm: $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(NQP_MO_COMBINED)
 	$(MKPATH) $(JS_STAGE2)
-	./nqp-m --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output gen/js/stage2/mininqpmo.moarvm $(JS_STAGE2)/$(NQP_MO_COMBINED) > node_modules/mininqpmo.js
+	$(JS_NQP) --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output $(JS_STAGE2)/mininqpmo.moarvm $(JS_STAGE2)/$(NQP_MO_COMBINED) > node_modules/mininqpmo.js
 
 js-stage1-compiler : $(JS_STAGE1_COMPILER)
 node_modules/mini-setting.setting.js: js-stage1-compiler src/vm/js/mini-setting $(JS_STAGE2)/mininqpmo.moarvm

diff --git a/tools/build/gen-js-makefile.nqp b/tools/build/gen-js-makefile.nqp
@@ -72,16 +72,10 @@ sub cross-compile(:$stage, :$source, :$target, :$setting, :$no-regex-lib, :$deps
     rule($moarvm, nqp::join(' ', $deps), 
         make_parents($moarvm),
 
-	"./nqp-m --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output gen/js/stage2/mininqpmo.moarvm $source > node_modules/mininqpmo.js"
+	"\$(JS_NQP) --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output $moarvm $source > node_modules/$target.js"
 
 #	"\$(JS_NQP) src/vm/js/bin/cross-compile.nqp $source $path $target $setting $no-regex-lib",
-# "\$(JS_PARROT)  -o $pbc $pir"
         );
-
-
-#	./nqp-m --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output gen/js/stage2/mininqpmo.moarvm src/vm/js/mini-nqpmo > node_modules/mininqpmo.js');
-
-
 }