aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/jdk/BUILD
diff options
context:
space:
mode:
Diffstat (limited to 'tools/jdk/BUILD')
-rw-r--r--tools/jdk/BUILD18
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 14699e14d0..4d92e13b19 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -4,7 +4,7 @@ load(
"//tools/jdk:default_java_toolchain.bzl",
"default_java_toolchain",
"JDK8_JVM_OPTS",
- "JDK9_JVM_OPTS",
+ "JDK10_JVM_OPTS",
"DEFAULT_JAVACOPTS",
)
@@ -219,23 +219,33 @@ default_java_toolchain(
)
default_java_toolchain(
- name = "toolchain_hostjdk9",
+ name = "toolchain_hostjdk10",
bootclasspath = [":bootclasspath"],
extclasspath = [":extclasspath"],
- jvm_opts = JDK9_JVM_OPTS,
+ jvm_opts = JDK10_JVM_OPTS,
source_version = "8",
target_version = "8",
)
default_java_toolchain(
name = "toolchain_java9",
- jvm_opts = JDK9_JVM_OPTS,
+ # We use the same flags for JDK9 and 10
+ jvm_opts = JDK10_JVM_OPTS,
misc = DEFAULT_JAVACOPTS + [
"--release",
"9",
],
)
+default_java_toolchain(
+ name = "toolchain_java10",
+ jvm_opts = JDK10_JVM_OPTS,
+ misc = DEFAULT_JAVACOPTS + [
+ "--release",
+ "10",
+ ],
+)
+
alias(
name = "toolchain",
actual = "//external:java_toolchain",