Select the correct toolchain for Windows arm64 after enabling cc toolchain resolution.

meteorcloudy · copybara-github · commit 138f06fc90a5 · 2023-08-10T01:54:14.000-07:00
PiperOrigin-RevId: 555413912
Change-Id: I3ccc0d51973849aaa891dd0944a00432ce3d2cfb
diff --git a/.bazelci/build_bazel_binaries.yml b/.bazelci/build_bazel_binaries.yml
@@ -52,8 +52,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
@@ -32,6 +32,9 @@ build:macos --macos_minimum_os=10.11
 # Therefore, use the local detected Python toolchain on Windows.
 build:windows --extra_toolchains=@bazel_tools//tools/python:autodetecting_toolchain
 
+build:windows_arm64 --platforms=//:windows_arm64
+build:windows_arm64 --extra_toolchains=@local_config_cc//:cc-toolchain-arm64_windows
+
 # Enable Bzlmod
 build:bzlmod --enable_bzlmod
 build:bzlmod --check_direct_dependencies=error
diff --git a/BUILD b/BUILD
@@ -248,6 +248,14 @@ platform(
     parents = ["@local_config_platform//:host"],
 )
 
+platform(
+    name = "windows_arm64",
+    constraint_values = [
+        "@platforms//os:windows",
+        "@platforms//cpu:arm64",
+    ],
+)
+
 REMOTE_PLATFORMS = ("rbe_ubuntu1804_java11",)
 
 [

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,14 @@ platform(`
`248`	`248`	`parents = ["@local_config_platform//:host"],`
`249`	`249`	`)`
`250`	`250`
	`251`	`+platform(`
	`252`	`+ name = "windows_arm64",`
	`253`	`+ constraint_values = [`
	`254`	`+ "@platforms//os:windows",`
	`255`	`+ "@platforms//cpu:arm64",`
	`256`	`+ ],`
	`257`	`+)`
	`258`	`+`
`251`	`259`	`REMOTE_PLATFORMS = ("rbe_ubuntu1804_java11",)`
`252`	`260`
`253`	`261`	`[`