mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-21 01:37:15 +03:00
a6809310e8
* bazel: 0.23.1 -> 0.24 * bazel-deps: Fix for Bazel 0.24.0 * bazel no longer supports + on dicts Replace by dict.update. * Fix junit classpath issue * azure: Update MacOS image to Mojave * Windows: --noincompatible_windows_escape_jvm_flags * rules_scala: Support escape_jvmflags * rules_scala: separate jvm_flags by TAB * Document --noincompatible_windows_escape_jvm_flags
14 lines
813 B
Diff
14 lines
813 B
Diff
diff --git a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java b/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java
|
|
index f54a578..0d871ef 100644
|
|
--- a/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java
|
|
+++ b/src/java/io/bazel/rulesscala/exe/LauncherFileWriter.java
|
|
@@ -36,7 +36,8 @@ public class LauncherFileWriter {
|
|
.addKeyValuePair("jar_bin_path", jarBinPath)
|
|
.addKeyValuePair("java_start_class", javaStartClass)
|
|
.addKeyValuePair("classpath", classpath)
|
|
- .addJoinedValues("jvm_flags", " ", jvmFlags)
|
|
+ .addKeyValuePair("escape_jvmflags", "0")
|
|
+ .addJoinedValues("jvm_flags", "\t", jvmFlags)
|
|
.build();
|
|
|
|
Path launcher = Paths.get(Runfiles.create().rlocation("bazel_tools/tools/launcher/launcher.exe"));
|