diff options
| author |  cushon <cushon@google.com> | 2018-05-14 09:38:41 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-14 09:40:24 -0700 |
| commit | a1ef999612dc16e243cf113f575c77d6ba516bed (patch) | |
| tree | cc7995e4a51b2266abb17d5584492ca5a75c2e2a | |
| parent | 747f0355f8149bcb18c818069dabec18579d0098 (diff) | |
Don't default to --release 9 when running on a JDK 9 host_javabase
PiperOrigin-RevId: 196518906
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java | 4 | ||||
| -rw-r--r-- | tools/jdk/BUILD | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java index 3bbc32e368..8db5c8b6f9 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java @@ -53,8 +53,8 @@ public class GenericRules implements RuleSet { .replace( "%java_toolchain%", isJdk8OrEarlier() - ? "@bazel_tools//tools/jdk:toolchain_jdk8" - : "@bazel_tools//tools/jdk:toolchain_jdk9")); + ? "@bazel_tools//tools/jdk:toolchain_hostjdk8" + : "@bazel_tools//tools/jdk:toolchain_hostjdk9")); } catch (IOException e) { throw new IllegalStateException(e); diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 92cf7dd21d..bc7161e370 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -213,7 +213,7 @@ genrule( ) default_java_toolchain( - name = "toolchain_jdk8", + name = "toolchain_hostjdk8", bootclasspath = [":bootclasspath"], extclasspath = [":extclasspath"], jvm_opts = JDK8_JVM_OPTS, @@ -222,7 +222,16 @@ default_java_toolchain( ) default_java_toolchain( - name = "toolchain_jdk9", + name = "toolchain_hostjdk9", + bootclasspath = [":bootclasspath"], + extclasspath = [":extclasspath"], + jvm_opts = JDK9_JVM_OPTS, + source_version = "8", + target_version = "8", +) + +default_java_toolchain( + name = "toolchain_java9", jvm_opts = JDK9_JVM_OPTS, misc = DEFAULT_JAVACOPTS + [ "--release", |