Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.1.1] Let native Turbine image find ct.sym with non-hermetic java_runtime #21670

Merged
merged 1 commit into from
Mar 13, 2024
Merged

[7.1.1] Let native Turbine image find ct.sym with non-hermetic java_runtime #21670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/starlark/builtins_bzl/common/java/java_toolchain.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
Loading