Merge remote-tracking branch 'origin/master' into wasix

This commit is contained in:
Christoph Herzog
2023-01-02 09:33:31 +01:00
30 changed files with 817 additions and 643 deletions

View File

@@ -464,9 +464,9 @@ impl CreateExe {
let file = files
.iter()
.find(|f| f.ends_with("libwasmer.a")).cloned()
.find(|f| f.ends_with("libwasmer.a") || f.ends_with("wasmer.lib")).cloned()
.ok_or_else(|| {
anyhow!("Could not find libwasmer.a for {} target in the provided tarball path (files = {files:#?})", target)
anyhow!("Could not find libwasmer.a / wasmer.lib for {} target in the provided tarball path (files = {files:#?})", target)
})?;
Ok((file, tarball_dir))