Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
toolchain_vanilla: Unset source and target language level versions
Browse files Browse the repository at this point in the history
Closes bazelbuild#9415.

The main feature of toolchain_vanilla definition is to support newer
Java language versions that the embedded JDK, e.g.: at the time of this
CL, toolchain_java could be used to support building with JDK 13 and
produce byte code major version 57, using the combination of absolute
javabase and toolchain_vanilla:

  $ bazel build --define=ABSOLUTE_JAVABASE=/use/local/bin/jdk-13 \
    --javabase=@bazel_tools//tools/jdk:absolute_javabase \
    --host_javabase=@bazel_tools//tools/jdk:absolute_javabase \
    --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla \
    --java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla \
    :gerrit

Unfortunately, 6ef6d87 sets source and
target language levels to Java 8 to restore backwards compatibility,
to fix a regression, that was introduced during bump of remote JDK
version to Java 11, in bad5a2b.

This change restores the neutrality of toolchain_vanilla declaration by
unsetting source and target language level versions. So that the bazel
invocation in the example above produces byte code major version 57
(Java 13), and not 52 (Java 8) as it is the case before this change.

Change-Id: I1f471c987487b81bc149d1ad4368eee149004d79
davido committed Sep 22, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent b6f33cd commit 966d203
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions tools/jdk/BUILD
Original file line number Diff line number Diff line change
@@ -379,6 +379,8 @@ default_java_toolchain(
forcibly_disable_header_compilation = True,
javabuilder = [":vanillajavabuilder"],
jvm_opts = [],
source_version = "",
target_version = "",
)

RELEASES = (8, 9, 10, 11)

0 comments on commit 966d203

Please sign in to comment.