mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-03-31 11:22:38 +02:00
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
diff --git a/.bazelrc b/.bazelrc
|
|
index a9c3518b09..b745319b41 100644
|
|
--- a/.bazelrc
|
|
+++ b/.bazelrc
|
|
@@ -94,3 +94,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 2d479f531f..3952e65ff3 100644
|
|
--- a/scripts/BUILD
|
|
+++ b/scripts/BUILD
|
|
@@ -9,9 +9,9 @@ genrule(
|
|
cmd = """
|
|
TMPDIR=$$(mktemp -d)
|
|
trap 'rm -rf $$TMPDIR' EXIT
|
|
- $(location //src:bazel) --batch --output_user_root=$$TMPDIR help completion bash > $@
|
|
+ $(location //src:bazel_nojdk) --batch --output_user_root=$$TMPDIR help completion bash > $@
|
|
""",
|
|
- tools = ["//src:bazel"],
|
|
+ tools = ["//src:bazel_nojdk"],
|
|
visibility = [
|
|
"//scripts/packages:__subpackages__",
|
|
"//src/test/py/bazel:__pkg__",
|