Skip to content
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

compiler,rust: No native-static-libs for wasm after 1.84 #14060

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −0
Open

compiler,rust: No native-static-libs for wasm after 1.84 #14060

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
3 changes: 3 additions & 0 deletions mesonbuild/compilers/rust.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ def _native_static_libs(self, work_dir: str, source_name: str) -> None:
# no match and kernel == none (i.e. baremetal) is a valid use case.
# return and let native_static_libs list empty
return
if self.info.system == 'emscripten':
# no match and emscripten is valid after rustc 1.84
return
Copy link
Member

Choose a reason for hiding this comment

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

If it's expected to always not match, should we skip running rustc --crate-type staticlib --print ....... entirely, and simply return early from the function depending on self.version comparison?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I mimicked the baremetal flow where not early-return. I understood that running "rustc" was interesting to check it the compiler can compile staticlib.

However, the decision is yours. Please let me know your preference, and I would be happy to assist with the early return

raise EnvironmentException('Failed to find native-static-libs in Rust compiler output.')
# Exclude some well known libraries that we don't need because they
# are always part of C/C++ linkers. Rustc probably should not print
Expand Down
Loading