Skip to content

Commit d5b3ecf

Browse files
fmeumcopybara-github
authored andcommitted
Use Turbine native image as header_compiler_direct
Copybara Import from #151 BEGIN_PUBLIC Use Turbine native image as `header_compiler_direct` (#151) Closes #151 END_PUBLIC COPYBARA_INTEGRATE_REVIEW=#151 from fmeum:native-turbine a7c426a PiperOrigin-RevId: 583046966 Change-Id: I40e2611aa74a390a88b10b817cc911cbb168925e
1 parent 971e733 commit d5b3ecf

2 files changed

Lines changed: 31 additions & 1 deletion

File tree

toolchains/BUILD

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,10 @@ cc_library(
159159
actual = "@remote_java_tools_%s//:prebuilt_singlejar" % OS,
160160
visibility = ["//visibility:private"],
161161
),
162+
alias(
163+
name = "turbine_direct_graal_%s" % OS,
164+
actual = "@remote_java_tools_%s//:turbine_direct_graal" % OS,
165+
),
162166
)
163167
for OS in [
164168
"linux",
@@ -220,6 +224,32 @@ alias(
220224
}),
221225
)
222226

227+
alias(
228+
name = "turbine_direct",
229+
actual = ":turbine_direct_graal_or_java",
230+
)
231+
232+
alias(
233+
name = "turbine_direct_graal_or_java",
234+
actual = select({
235+
"@bazel_tools//src/conditions:darwin_arm64": ":turbine_direct_graal_darwin_arm64",
236+
"@bazel_tools//src/conditions:darwin_x86_64": ":turbine_direct_graal_darwin_x86_64",
237+
"@bazel_tools//src/conditions:linux_x86_64": ":turbine_direct_graal_linux",
238+
"@bazel_tools//src/conditions:windows": ":turbine_direct_graal_windows",
239+
"//conditions:default": "@remote_java_tools//:TurbineDirect",
240+
}),
241+
)
242+
243+
alias(
244+
name = "turbine_direct_graal",
245+
actual = select({
246+
"@bazel_tools//src/conditions:darwin_arm64": ":turbine_direct_graal_darwin_arm64",
247+
"@bazel_tools//src/conditions:darwin_x86_64": ":turbine_direct_graal_darwin_x86_64",
248+
"@bazel_tools//src/conditions:linux_x86_64": ":turbine_direct_graal_linux",
249+
"@bazel_tools//src/conditions:windows": ":turbine_direct_graal_windows",
250+
}),
251+
)
252+
223253
bootclasspath(
224254
name = "platformclasspath",
225255
src = "DumpPlatformClassPath.java",

toolchains/default_java_toolchain.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ _BASE_TOOLCHAIN_CONFIGURATION = dict(
7272
forcibly_disable_header_compilation = False,
7373
genclass = [Label("@remote_java_tools//:GenClass")],
7474
header_compiler = [Label("@remote_java_tools//:TurbineDirect")],
75-
header_compiler_direct = [Label("@remote_java_tools//:TurbineDirect")],
75+
header_compiler_direct = [Label("//toolchains:turbine_direct")],
7676
ijar = [Label("//toolchains:ijar")],
7777
javabuilder = [Label("@remote_java_tools//:JavaBuilder")],
7878
javac_supports_workers = True,

0 commit comments

Comments
 (0)