Remove Parrot opts, add javaclass opt for JVM.

Raku · Apr 15, 2013 · 0f2b9a2 · 0f2b9a2
1 parent 9e12e1c
commit 0f2b9a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/NQP/Compiler.nqp b/src/NQP/Compiler.nqp
@@ -14,10 +14,16 @@ my @clo := $nqpcomp.commandline_options();
 @clo.push('setting=s');
 @clo.push('setting-path=s');
 @clo.push('module-path=s');
-@clo.push('vmlibs=s');
 @clo.push('no-regex-lib');
-@clo.push('dynext=s');
 @clo.push('stable-sc');
+#?if parrot
+@clo.push('vmlibs=s');
+@clo.push('dynext=s');
+#?endif
+#?if jvm
+@clo.push('javaclass=s');
+$nqpcomp.addstage('classname', :after<start>);
+#?endif
 
 sub MAIN(@ARGS) {
     # Enter the compiler.

diff --git a/src/vm/jvm/HLL/Backend.nqp b/src/vm/jvm/HLL/Backend.nqp
@@ -55,7 +55,8 @@ class HLL::Backend::JVM {
     }
 
     method jast($qast, *%adverbs) {
-        nqp::getcomp('qast').jast($qast, :classname(nqp::sha1('eval-at-' ~ nqp::time_n())));
+        my $classname := %*COMPILING<%?OPTIONS><javaclass> || nqp::sha1('eval-at-' ~ nqp::time_n());
+        nqp::getcomp('qast').jast($qast, :$classname);
     }
 
     method classfile($jast, *%adverbs) {