bazel: restore native Windows C++ toolchain resolution

This commit is contained in:
Adam Perry
2026-06-09 18:24:55 +00:00
parent 2f0057ff39
commit cc628d090f
2 changed files with 9 additions and 3 deletions
+5 -2
View File
@@ -27,10 +27,13 @@ platform(
platform(
name = "local_windows_msvc",
constraint_values = [
"@llvm//constraints/windows_abi:msvc",
# Rust exec tools use the MSVC ABI, while C/C++ actions still use the
# hermetic llvm-mingw toolchain.
"@llvm//constraints/windows_abi:gnullvm",
"@platforms//cpu:x86_64",
"@platforms//os:windows",
"@rules_rs//rs/experimental/platforms/constraints:windows_msvc",
],
parents = ["@platforms//host"],
)
# The hermetic LLVM Windows toolchain is llvm-mingw and therefore gnullvm.
+4 -1
View File
@@ -41,7 +41,10 @@ require_count() {
}
require_platform_constraint local_windows "@llvm//constraints/windows_abi:gnullvm"
require_platform_constraint local_windows_msvc "@llvm//constraints/windows_abi:msvc"
require_platform_constraint local_windows_msvc "@llvm//constraints/windows_abi:gnullvm"
require_platform_constraint local_windows_msvc "@platforms//cpu:x86_64"
require_platform_constraint local_windows_msvc "@platforms//os:windows"
require_platform_constraint local_windows_msvc "@rules_rs//rs/experimental/platforms/constraints:windows_msvc"
require_platform_constraint windows_x86_64_gnullvm "@llvm//constraints/windows_abi:gnullvm"
require_platform_constraint windows_x86_64_msvc "@llvm//constraints/windows_abi:msvc"
require_platform_constraint release_windows_arm64 "@llvm//constraints/windows_abi:gnullvm"