From b2df0de6fb295255959c4e821d4cc7931e63bd7c Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Fri, 8 Mar 2024 06:19:00 -0800 Subject: [PATCH] Let native Turbine image find `ct.sym` with non-hermetic `java_runtime` Work towards #21604 Closes #21610. PiperOrigin-RevId: 613912980 Change-Id: Ibc620120b783c990d08b84ea6cd8ae224333ed8a --- src/main/starlark/builtins_bzl/common/java/java_toolchain.bzl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/starlark/builtins_bzl/common/java/java_toolchain.bzl b/src/main/starlark/builtins_bzl/common/java/java_toolchain.bzl index 9a96df3695c2e0..d49347cbaa32b4 100644 --- a/src/main/starlark/builtins_bzl/common/java/java_toolchain.bzl +++ b/src/main/starlark/builtins_bzl/common/java/java_toolchain.bzl @@ -81,6 +81,10 @@ def _java_toolchain_impl(ctx): if java_runtime and java_runtime.lib_ct_sym: header_compiler_direct_data = [java_runtime.lib_ct_sym] header_compiler_direct_jvm_opts = ["-Dturbine.ctSymPath=" + java_runtime.lib_ct_sym.path] + elif java_runtime and java_runtime.java_home: + # Turbine finds ct.sym relative to java.home. + header_compiler_direct_data = [] + header_compiler_direct_jvm_opts = ["-Djava.home=" + java_runtime.java_home] else: header_compiler_direct_data = [] header_compiler_direct_jvm_opts = []