Skip to content

Commit cc67ead

Browse files
committed
fix: platform transition now correctly selects wasm32-wasip2
- Update to commit 2a8c7b8e6fdf0dbdf1c4914f897e3f95f674e275 with repository context fix - Use @rules_rust//rust/platform constraints for WASI version differentiation - Platform transition successfully resolves to wasm32-wasip2 (not wasip1) The toolchain is now correctly selecting wasm32-wasip2 as evidenced by: external/rules_rust++rust+rust_macos_aarch64__wasm32-wasip2__stable_tools Fixes #2
1 parent 3b9dae0 commit cc67ead

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "rules_rust", version = "0.62.0")
1212
# Git override to use rules_rust fork with wasm32-wasip2 support
1313
git_override(
1414
module_name = "rules_rust",
15-
commit = "54f0df94dccdd34fa35a22adfb7b4626e85d99b4", # Commit with WASI constraint system fixes
15+
commit = "2a8c7b8e6fdf0dbdf1c4914f897e3f95f674e275", # Latest commit with repository context fix
1616
remote = "https://github.com/avrabe/rules_rust.git",
1717
)
1818

platforms/BUILD.bazel

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
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-
)
3+
# Note: WASI version constraints are now provided by the patched rules_rust
4+
# at @rules_rust//rust/platform:wasi_preview_1 and :wasi_preview_2
215

226
platform(
237
name = "wasm32-wasi",
248
constraint_values = [
259
"@platforms//cpu:wasm32",
2610
"@platforms//os:wasi",
27-
":wasi_preview_1",
11+
"@rules_rust//rust/platform:wasi_preview_1",
2812
],
2913
visibility = ["//visibility:public"],
3014
)
@@ -43,7 +27,7 @@ platform(
4327
constraint_values = [
4428
"@platforms//cpu:wasm32",
4529
"@platforms//os:wasi",
46-
":wasi_preview_1",
30+
"@rules_rust//rust/platform:wasi_preview_1",
4731
],
4832
visibility = ["//visibility:public"],
4933
)
@@ -53,7 +37,7 @@ platform(
5337
constraint_values = [
5438
"@platforms//cpu:wasm32",
5539
"@platforms//os:wasi",
56-
":wasi_preview_2",
40+
"@rules_rust//rust/platform:wasi_preview_2",
5741
],
5842
visibility = ["//visibility:public"],
5943
)

0 commit comments

Comments
 (0)