diff options
| author |  cushon <cushon@google.com> | 2018-03-28 08:35:56 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-03-28 08:37:48 -0700 |
| commit | 1236187e8b2464fe0fce5db802179dc8a6b4d550 (patch) | |
| tree | 161914ee463df3b8c95e84acc7e6ddaeddd96429 /tools/jdk | |
| parent | 1e00497c61323d1b7f0992b21887474283ebe0cb (diff) | |
Use the provided javac for host_javabase=9
Follow-up to 7ee0c670412d508cad0518a45961b9244921d649
PiperOrigin-RevId: 190776857
Diffstat (limited to 'tools/jdk')
| -rw-r--r-- | tools/jdk/default_java_toolchain.bzl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl index ca2ed87de7..1ebae39370 100644 --- a/tools/jdk/default_java_toolchain.bzl +++ b/tools/jdk/default_java_toolchain.bzl @@ -15,7 +15,7 @@ """Bazel rules for creating Java toolchains.""" JDK8_JVM_OPTS = [ - "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)", + "-Xbootclasspath/p:$(location @bazel_tools//third_party/java/jdk/langtools:javac_jar)", ] JDK9_JVM_OPTS = [ @@ -29,9 +29,9 @@ JDK9_JVM_OPTS = [ "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", - # TODO(cushon): override the javac in the JDK. - # "--patch-module=java.compiler=$(location //third_party/java/jdk/langtools/blaze:java_compiler_jar)", - # "--patch-module=jdk.compiler=$(location //third_party/java/jdk/langtools/blaze:jdk_compiler_jar)", + # override the javac in the JDK. + "--patch-module=java.compiler=$(location @bazel_tools//third_party/java/jdk/langtools:java_compiler_jar)", + "--patch-module=jdk.compiler=$(location @bazel_tools//third_party/java/jdk/langtools:jdk_compiler_jar)", ] DEFAULT_COMPATIBLE_JAVACOPTS = { @@ -64,7 +64,11 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = { "header_compiler": ["@bazel_tools//tools/jdk:turbine"], "ijar": ["@bazel_tools//tools/jdk:ijar"], "javabuilder": ["@bazel_tools//tools/jdk:javabuilder"], - "javac": ["//third_party/java/jdk/langtools:javac_jar"], + "javac": ["@bazel_tools//third_party/java/jdk/langtools:javac_jar"], + "tools": [ + "@bazel_tools//third_party/java/jdk/langtools:java_compiler_jar", + "@bazel_tools//third_party/java/jdk/langtools:jdk_compiler_jar", + ], "javac_supports_workers": 1, "jvm_opts": JDK8_JVM_OPTS, "misc": DEFAULT_JAVACOPTS, |