Fix JVM runner generation on Windows.

%CLASSPATH% may end up with spaces in, and also needs the correct separator.
rakudo · Feb 28, 2015 · ac026be · ac026be
1 parent 631219a
commit ac026be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tools/build/create-jvm-runner.pl b/tools/build/create-jvm-runner.pl
@@ -54,7 +54,7 @@ sub install {
 
 my $classpath = join($cpsep, ($jardir, $libdir, $nqplibdir));
 my $jopts = '-noverify -Xms100m -Xbootclasspath/a:' . $bootclasspath 
-          . ' -cp ' . ($^O eq 'MSWin32' ? '%CLASSPATH%' : '$CLASSPATH') . ":" . $classpath
+          . ' -cp ' . ($^O eq 'MSWin32' ? '"%CLASSPATH%";' : '$CLASSPATH:') . $classpath
           . ' -Dperl6.prefix=' . $prefix
           . ($^O eq 'MSWin32' ? ' -Dperl6.execname="%~dpf0"' : ' -Dperl6.execname="$0"');