mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-06 12:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when WASMER_DIR is not defined + prepare libwasmer-headless

Browse Source
This commit is contained in:
Felix Schütt
2022-12-23 14:44:28 +01:00
parent 88f6933876
commit acdc7e2498
2 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/cli/src/commands/create_exe.rs
View File

@@ -1014,7 +1014,13 @@ pub(super) mod utils {
let file = files
.iter()
.find(|f| f.ends_with("libwasmer.a")).cloned()
.find(|f| f.ends_with("libwasmer-headless.a"))
.or_else(|| {
files
.iter()
.find(|f| f.ends_with("libwasmer.a"))
})
.cloned()
.ok_or_else(|| {
anyhow!("Could not find libwasmer.a for {} target in the provided tarball path (files = {files:#?})", target)
})?;
@@ -1096,15 +1102,7 @@ pub(super) mod utils {
}
pub(super) fn get_wasmer_dir() -> anyhow::Result<PathBuf> {
Ok(PathBuf::from(
env::var("WASMER_DIR")
.or_else(|e| {
option_env!("WASMER_INSTALL_PREFIX")
.map(str::to_string)
.ok_or(e)
})
.context("Trying to read env var `WASMER_DIR`")?,
))
wasmer_registry::WasmerConfig::get_wasmer_dir().map_err(|e| anyhow::anyhow!("{e}"))
}
pub(super) fn get_wasmer_include_directory() -> anyhow::Result<PathBuf> {