Merge pull request #996 from usev6/jvm_build_blib

[JVM] Don't use --nqp-lib=blib for evalserver
rakudo · Jan 17, 2017 · 71fd417 · 71fd417
2 parents e041b0f + 39bf63f
commit 71fd417
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/tools/build/create-jvm-runner.pl b/tools/build/create-jvm-runner.pl
@@ -43,7 +43,6 @@
 : \${PERL6_JARS:=\"$perl6jars\"}
 exec ";
 my $postamble = $^O eq 'MSWin32' ? ' %*' : ' "$@"';
-$postamble = " $blib $postamble" if $blib;
 
 sub install {
     my ($name, $command) = @_;
@@ -74,7 +73,7 @@ sub install {
     install "perl6-debug-j", "java $jopts perl6-debug";
 }
 else {
-    install "perl6-j", "java $jopts perl6";
-    install "perl6-jdb-server", "java $jdbopts $jopts perl6";
+    install "perl6-j", "java $jopts perl6 $blib";
+    install "perl6-jdb-server", "java $jdbopts $jopts perl6 $blib";
     install "perl6-eval-server", "java -Xmx3000m -XX:MaxPermSize=200m $jopts org.perl6.nqp.tools.EvalServer";
 }