[6.4.0] Cherry-pick commits to fix a Windows issue (#19232)

Cherry-picked three commits (138f06f , d0de5e0 and 5647b26) to fix a Windows issue. 1.Disable using NEON instructions on Windows arm64 Commit d0de5e0 PiperOrigin-RevId: 555467146 Change-Id: Ib34811467d7f0f6980bfa4976b8d1ba2fb041b16 2.Select the correct toolchain for Windows arm64 after enabling cc tool… Commit 138f06f PiperOrigin-RevId: 555413912 Change-Id: I3ccc0d51973849aaa891dd0944a00432ce3d2cfb 3.Enable cc toolchain resolution for building Bazel Commit 5647b26 PiperOrigin-RevId: 551218176 Change-Id: Ia01c3b83b071b50b353f116dbd360bd3fe04f0c3 --------- Co-authored-by: Googler <[email protected]> Co-authored-by: Chi Wang <[email protected]>
bazelbuild · Aug 17, 2023 · 8ac1cc1 · 8ac1cc1
1 parent e34112f
commit 8ac1cc1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git 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
@@ -27,13 +27,19 @@ 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
 
 # Enable Java 11 language features (https://github.com/bazelbuild/bazel/issues/14592)
 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
@@ -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
@@ -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",
         ],