mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-07 09:41:39 +01:00
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
diff --git a/.bazelrc b/.bazelrc
|
|
index 8514bcc863..ae05d82e4d 100644
|
|
--- a/.bazelrc
|
|
+++ b/.bazelrc
|
|
@@ -92,3 +92,5 @@ test:ci-windows --test_env=JAVA_HOME
|
|
test:ci-windows --test_env=TEST_INSTALL_BASE=C:/b/bazeltest_install_base
|
|
test:ci-windows --test_env=REPOSITORY_CACHE=C:/b/bazeltest_repo_cache
|
|
test:ci-windows --test_tag_filters=-no_windows,-slow
|
|
+
|
|
+common --extra_toolchains=//abuild:non_prebuilt_java_21_toolchain_definition
|
|
diff --git a/abuild/BUILD.bazel b/abuild/BUILD.bazel
|
|
new file mode 100644
|
|
index 0000000000..23a349134b
|
|
--- /dev/null
|
|
+++ b/abuild/BUILD.bazel
|
|
@@ -0,0 +1,11 @@
|
|
+load("@rules_java//toolchains:default_java_toolchain.bzl", "default_java_toolchain")
|
|
+
|
|
+default_java_toolchain(
|
|
+ name = "non_prebuilt_java_21_toolchain",
|
|
+ header_compiler_direct = "@remote_java_tools//:TurbineDirect",
|
|
+ ijar = "//third_party/ijar:ijar",
|
|
+ java_runtime = "@local_jdk//:jdk",
|
|
+ singlejar = "//src/tools/singlejar:singlejar",
|
|
+ source_version = "21",
|
|
+ target_version = "21",
|
|
+)
|
|
diff --git a/scripts/BUILD b/scripts/BUILD
|
|
index d25c00a925..715c5ab85f 100644
|
|
--- a/scripts/BUILD
|
|
+++ b/scripts/BUILD
|
|
@@ -12,7 +12,7 @@ genrule(
|
|
outs = ["bazel-complete.bash"],
|
|
cmd = " ".join([
|
|
"$(location :generate_bash_completion.sh)",
|
|
- "--bazel=$(location //src:bazel)",
|
|
+ "--bazel=$(location //src:bazel_nojdk)",
|
|
"--output=$@",
|
|
"--prepend=$(location bazel-complete-header.bash)",
|
|
"--prepend=$(location bazel-complete-template.bash)",
|
|
@@ -20,7 +20,7 @@ genrule(
|
|
output_to_bindir = 1,
|
|
tools = [
|
|
":generate_bash_completion.sh",
|
|
- "//src:bazel",
|
|
+ "//src:bazel_nojdk",
|
|
],
|
|
visibility = [
|
|
"//scripts/packages:__subpackages__",
|