Use all @llvm constraints

MODULE.bazel

@@ -57,7 +57,7 @@ bazel_dep(name = "platforms", version = "0.0.5")
 bazel_dep(name = "protobuf", version = "34.0.bcr.1", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_cc", version = "0.2.8")
 bazel_dep(name = "rules_proto", version = "7.1.0")
-bazel_dep(name = "llvm", version = "0.7.6")
+bazel_dep(name = "llvm", version = "0.7.7")
 bazel_dep(name = "aspect_tools_telemetry", version = "0.3.3")
 
 osx = use_extension("@llvm//extensions:osx.bzl", "osx")

README.md

@@ -26,7 +26,7 @@ This is the default setup for new users. It provisions the patched `rules_rust`,
 
 ```bzl
 bazel_dep(name = "rules_rs", version = "0.0.61")
-bazel_dep(name = "llvm", version = "0.7.3")
+bazel_dep(name = "llvm", version = "0.7.7")
 bazel_dep(name = "platforms", version = "1.0.0")
 
 toolchains = use_extension("@rules_rs//rs/toolchains:module_extension.bzl", "toolchains")
@@ -89,7 +89,7 @@ platform(
     name = "local_windows_msvc",
     parents = ["@platforms//host"],
     constraint_values = [
-        "@rules_rs//rs/platforms/constraints:windows_msvc",
+        "@llvm//constraints/windows/abi:msvc",
     ],
 )
 ```

rs/platforms/triples.bzl

@@ -4,12 +4,6 @@ load(
     _triple_to_constraint_set = "triple_to_constraint_set",
 )
 
-_WINDOWS_ABI_CONSTRAINTS = {
-    "gnu": "@rules_rs//rs/platforms/constraints:windows_gnu",
-    "gnullvm": "@rules_rs//rs/platforms/constraints:windows_gnullvm",
-    "msvc": "@rules_rs//rs/platforms/constraints:windows_msvc",
-}
-
 def triple_to_constraint_set(target_triple):
     constraints = _triple_to_constraint_set(target_triple)
     t = triple(target_triple)
@@ -22,13 +16,13 @@ def triple_to_constraint_set(target_triple):
         else:
             constraints.append("@llvm//constraints/libc:gnu.2.28")
     elif t.system == "windows":
-        constraints.append(_WINDOWS_ABI_CONSTRAINTS[t.abi])
+        constraints.append("@llvm//constraints/windows/abi:" + t.abi)
 
         # Rust links MSVCRT for both GNU Windows target specs:
         # https://github.com/rust-lang/rust/blob/c935696dd07ca51e6fba2f6579919eea2a50863b/compiler/rustc_target/src/spec/base/windows_gnullvm.rs#L19
         # https://github.com/rust-lang/rust/blob/c935696dd07ca51e6fba2f6579919eea2a50863b/compiler/rustc_target/src/spec/base/windows_gnu.rs#L44
         if t.abi in ("gnu", "gnullvm"):
-            constraints.append("@llvm//toolchain:windows_crt_msvcrt")
+            constraints.append("@llvm//constraints/windows/crt:msvcrt")
 
     return constraints
 

rs/toolchains/declare_rustc_toolchains.bzl

@@ -73,9 +73,9 @@ def declare_rustc_toolchains(
                 "//conditions:default": "",
             }),
             staticlib_ext = select({
-                "@rules_rs//rs/platforms/constraints:windows_gnu": ".a",
-                "@rules_rs//rs/platforms/constraints:windows_gnullvm": ".a",
-                "@rules_rs//rs/platforms/constraints:windows_msvc": ".lib",
+                "@llvm//constraints/windows/abi:gnu": ".a",
+                "@llvm//constraints/windows/abi:gnullvm": ".a",
+                "@llvm//constraints/windows/abi:msvc": ".lib",
                 "@platforms//os:none": "",
                 "@platforms//os:emscripten": ".js",
                 "@platforms//os:uefi": ".lib",
@@ -102,9 +102,9 @@ def declare_rustc_toolchains(
                 "@platforms//os:nixos": ["-ldl", "-lpthread"],
                 "@platforms//os:openbsd": ["-lpthread"],
                 "@platforms//os:ios": ["-lSystem", "-lobjc", "-Wl,-framework,Security", "-Wl,-framework,Foundation", "-lresolv"],
-                "@rules_rs//rs/platforms/constraints:windows_gnu": ["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"],
-                "@rules_rs//rs/platforms/constraints:windows_gnullvm": ["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"],
-                "@rules_rs//rs/platforms/constraints:windows_msvc": [
+                "@llvm//constraints/windows/abi:gnu": ["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"],
+                "@llvm//constraints/windows/abi:gnullvm": ["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"],
+                "@llvm//constraints/windows/abi:msvc": [
                     "advapi32.lib",
                     "ws2_32.lib",
                     "userenv.lib",

test/MODULE.bazel

@@ -1,5 +1,5 @@
 bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "llvm", version = "0.7.6")
+bazel_dep(name = "llvm", version = "0.7.7")
 bazel_dep(name = "apple_support", version = "1.24.2", repo_name = "build_bazel_apple_support")
 
 # SBOM