Skip to content

Fix nightly WASM target #5799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Fix nightly WASM target #5799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/collections/codepointtrie_builder/cpp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ wasm_obj/icu4c/%.o: $(ICU4C_SOURCE)/%.cpp
wasm_obj/ucptrie_wrap.o: ucptrie_wrap.cpp
mkdir -p wasm_obj
$(CXX) --target=wasm32-unknown-wasi \
-I/usr/include/wasm32-wasi \
-I/usr/include/wasm32-wasip1 \
Copy link
Member

@sffc sffc Nov 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue: This is impacting the include path of clang++, not Rust

--compile \
-flto \
-I$(ICU4C_SOURCE)/common \
Expand Down
2 changes: 1 addition & 1 deletion tutorials/gn/build/rust_wasi/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
import("//tutorials/gn/build/rust_toolchain.gni")

rust_toolchain("rust_wasi") {
rust_target = "wasm32-wasi"
rust_target = "wasm32-wasip1"
}
2 changes: 1 addition & 1 deletion tutorials/gn/gn.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ assert ${third_party_tools} "The GN third-party tools are not installed.\n*** Pl

cd tutorials/gn

exec --fail-on-error rustup target add wasm32-wasi --toolchain ${PINNED_CI_NIGHTLY}
exec --fail-on-error rustup target add wasm32-wasip1 --toolchain ${PINNED_CI_NIGHTLY}

exec --fail-on-error ./third_party_tools/bin/gn gen --root=../.. --args=target_os="wasi" out/wasi
exec --fail-on-error rustup run ${PINNED_CI_NIGHTLY} ./third_party_tools/depot_tools/ninja -C out/wasi
Expand Down