Skip to content

Commit 3b9dae0

Browse files
committed
fix: update to latest patched rules_rust with WASI constraint system
- Update to commit 54f0df94dccdd34fa35a22adfb7b4626e85d99b4 with WASI fixes - Add custom WASI version constraints to distinguish preview versions - Platform selection fix is being addressed upstream in rules_rust References: avrabe/rules_rust#1
1 parent f151bef commit 3b9dae0

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ module(
99
# Dependencies for WebAssembly tooling
1010
bazel_dep(name = "rules_rust", version = "0.62.0")
1111

12-
# Git override to use rules_rust fork with wasm32-wasip2 support
12+
# Git override to use rules_rust fork with wasm32-wasip2 support
1313
git_override(
1414
module_name = "rules_rust",
15-
commit = "2389792cfac37da28033e2bca8b712a3c6d961e2",
15+
commit = "54f0df94dccdd34fa35a22adfb7b4626e85d99b4", # Commit with WASI constraint system fixes
1616
remote = "https://github.com/avrabe/rules_rust.git",
1717
)
1818

platforms/BUILD.bazel

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
11
"""Platform definitions for WASM targets"""
22

3+
# Custom WASI version constraints to distinguish between preview versions
4+
constraint_setting(
5+
name = "wasi_version",
6+
default_constraint_value = ":wasi_preview_1",
7+
visibility = ["//visibility:public"],
8+
)
9+
10+
constraint_value(
11+
name = "wasi_preview_1",
12+
constraint_setting = ":wasi_version",
13+
visibility = ["//visibility:public"],
14+
)
15+
16+
constraint_value(
17+
name = "wasi_preview_2",
18+
constraint_setting = ":wasi_version",
19+
visibility = ["//visibility:public"],
20+
)
21+
322
platform(
423
name = "wasm32-wasi",
524
constraint_values = [
625
"@platforms//cpu:wasm32",
726
"@platforms//os:wasi",
27+
":wasi_preview_1",
828
],
929
visibility = ["//visibility:public"],
1030
)
@@ -23,6 +43,7 @@ platform(
2343
constraint_values = [
2444
"@platforms//cpu:wasm32",
2545
"@platforms//os:wasi",
46+
":wasi_preview_1",
2647
],
2748
visibility = ["//visibility:public"],
2849
)
@@ -31,7 +52,8 @@ platform(
3152
name = "wasm32-wasip2",
3253
constraint_values = [
3354
"@platforms//cpu:wasm32",
34-
"@platforms//os:wasi",
55+
"@platforms//os:wasi",
56+
":wasi_preview_2",
3557
],
3658
visibility = ["//visibility:public"],
3759
)

0 commit comments

Comments
 (0)