From 001a65066e49e33754d7c5146141b0cf960e0974 Mon Sep 17 00:00:00 2001 From: Benjamin Carlsson Date: Thu, 10 Sep 2026 21:41:28 -0700 Subject: [PATCH] Pass the ARM64 compiler workaround through Bazel startup options --- .github/scripts/run-bazel-ci.sh | 3 +++ .github/workflows/rust-release-windows.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/scripts/run-bazel-ci.sh b/.github/scripts/run-bazel-ci.sh index 89f937a998..5825893fbc 100755 --- a/.github/scripts/run-bazel-ci.sh +++ b/.github/scripts/run-bazel-ci.sh @@ -47,6 +47,9 @@ if [[ $# -eq 0 ]]; then fi bazel_startup_args=() +if [[ -n "${BAZEL_HOST_JVM_ARG:-}" ]]; then + bazel_startup_args+=("--host_jvm_args=${BAZEL_HOST_JVM_ARG}") +fi if [[ -n "${BAZEL_OUTPUT_USER_ROOT:-}" ]]; then bazel_startup_args+=("--output_user_root=${BAZEL_OUTPUT_USER_ROOT}") fi diff --git a/.github/workflows/rust-release-windows.yml b/.github/workflows/rust-release-windows.yml index 8ec85f3346..f73ad2b61b 100644 --- a/.github/workflows/rust-release-windows.yml +++ b/.github/workflows/rust-release-windows.yml @@ -221,7 +221,7 @@ jobs: ARCH: ${{ matrix.arch }} VOICE_ARCH: ${{ matrix.arch }} # Avoid the observed Java 25 C1 crash in this method on Windows ARM64. - JAVA_TOOL_OPTIONS: ${{ matrix.arch == 'aarch64' && '-XX:CompileCommand=exclude,net.starlark.java.eval.BuiltinFunction::getPositionalOnlyArgumentVector' || '' }} + BAZEL_HOST_JVM_ARG: ${{ matrix.arch == 'aarch64' && '-XX:CompileCommand=exclude,net.starlark.java.eval.BuiltinFunction::getPositionalOnlyArgumentVector' || '' }} BUILDBUDDY_API_KEY: "" run: | (cd codex-rs && cargo update --workspace)