Skip to content

componentize: Tweak clang version parsing #3031

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
Mar 4, 2025
Merged

componentize: Tweak clang version parsing #3031

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
6 changes: 6 additions & 0 deletions crates/componentize/src/bugs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ impl std::error::Error for WasiLibc377Bug {}
fn parse_clang_version(ver: &str) -> Option<(u16, u16, u16)> {
// Strip optional trailing detail after space
let ver = ver.split(' ').next().unwrap();
// Strip optional -wasi-sdk suffix
let ver = ver.strip_suffix("-wasi-sdk").unwrap_or(ver);
let mut parts = ver.split('.');
let major = parts.next()?.parse().ok()?;
let minor = parts.next()?.parse().ok()?;
Expand Down Expand Up @@ -82,6 +84,10 @@ mod tests {
r#"(module (@producers (processed-by "clang" "15.0.7")))"#,
true,
),
(
r#"(module (@producers (processed-by "clang" "18.1.2-wasi-sdk (https://github.com/llvm/llvm-project 26a1d6601d727a96f4301d0d8647b5a42760ae0c)")))"#,
true,
),
(
r#"(module (@producers (processed-by "clang" "15.0.6")))"#,
false,
Expand Down
Loading