mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-20 01:07:18 +03:00
9472bf3c6c
* initial attempt to upgrade to jdk17 * patch rules_nixpkgs to allow for jdk 17 * format * fix compatibility/.bazelrc * update jar_jar, disable jdk8 * get jarjar's hash right * ignore timestamp parsing test for now * fix build-release-artifacts * fix JsonLfDecodersTest in the code drop * dadew --------- Co-authored-by: = <=> Co-authored-by: Gary Verhaegen <gary.verhaegen@digitalasset.com>
19 lines
740 B
Diff
19 lines
740 B
Diff
diff --git a/toolchains/java/default_java_toolchain.bzl b/toolchains/java/default_java_toolchain.bzl
|
|
index 1919433..6cf40bc 100644
|
|
--- a/toolchains/java/default_java_toolchain.bzl
|
|
+++ b/toolchains/java/default_java_toolchain.bzl
|
|
@@ -42,8 +42,8 @@ BASE_JDK9_JVM_OPTS = [
|
|
|
|
JDK9_JVM_OPTS = BASE_JDK9_JVM_OPTS + [
|
|
# override the javac in the JDK.
|
|
- "--patch-module=java.compiler=$(location @remote_java_tools//:java_compiler_jar)",
|
|
- "--patch-module=jdk.compiler=$(location @remote_java_tools//:jdk_compiler_jar)",
|
|
+ #"--patch-module=java.compiler=$(location @remote_java_tools//:java_compiler_jar)",
|
|
+ #"--patch-module=jdk.compiler=$(location @remote_java_tools//:jdk_compiler_jar)",
|
|
]
|
|
|
|
DEFAULT_JAVACOPTS = [
|
|
--
|
|
2.34.1
|
|
|