diff --git a/.bazelci/build_bazel_binaries.yml b/.bazelci/build_bazel_binaries.yml index aad1874aee294f..091832608939e7 100644 --- a/.bazelci/build_bazel_binaries.yml +++ b/.bazelci/build_bazel_binaries.yml @@ -55,8 +55,7 @@ platforms: - "--host_copt=-w" - "-c" - "opt" - - "--cpu=x64_arm64_windows" - - "--incompatible_enable_cc_toolchain_resolution" + - "--config=windows_arm64" build_targets: - "//src:bazel.exe" - "//src:bazel_nojdk.exe" diff --git a/.bazelrc b/.bazelrc index dc2e5ceb7d6cd2..52046256aebeaf 100644 --- a/.bazelrc +++ b/.bazelrc @@ -27,6 +27,9 @@ build:remote --config=ubuntu1804_java11 build:macos --macos_minimum_os=10.11 +build:windows_arm64 --platforms=//:windows_arm64 +build:windows_arm64 --extra_toolchains=@local_config_cc//:cc-toolchain-arm64_windows + # Enable Bzlmod build:bzlmod --experimental_enable_bzlmod @@ -34,6 +37,9 @@ build:bzlmod --experimental_enable_bzlmod build --java_language_version=11 build --tool_java_language_version=11 +# Manually enable cc toolchain resolution before it is flipped. https://github.com/bazelbuild/bazel/issues/7260 +build --incompatible_enable_cc_toolchain_resolution + # User-specific .bazelrc try-import %workspace%/user.bazelrc diff --git a/BUILD b/BUILD index b87ebc94316f26..6a3a2272fb39a5 100644 --- a/BUILD +++ b/BUILD @@ -220,6 +220,14 @@ platform( parents = ["@local_config_platform//:host"], ) +platform( + name = "windows_arm64", + constraint_values = [ + "@platforms//os:windows", + "@platforms//cpu:arm64", + ], +) + REMOTE_PLATFORMS = ("rbe_ubuntu1804_java11",) [ diff --git a/third_party/blake3/blake3.BUILD b/third_party/blake3/blake3.BUILD index 867e33f67c6cec..f141a9c32503d6 100644 --- a/third_party/blake3/blake3.BUILD +++ b/third_party/blake3/blake3.BUILD @@ -58,6 +58,9 @@ cc_library( "-DBLAKE3_NO_AVX512", ], "@bazel_tools//src/conditions:windows_x64": [], + "@bazel_tools//src/conditions:windows_arm64": [ + "-DBLAKE3_USE_NEON=0", + ], "@bazel_tools//src/conditions:darwin_arm64": [ "-DBLAKE3_USE_NEON=1", ],