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

Remove support for wasmer-headless for now, remove -lunwind

Browse Source
This commit is contained in:
Felix Schütt
2022-12-29 20:50:25 +01:00
parent 8806c67635
commit 1a572f976b
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,11 +473,8 @@ fn test_prefix_parsing() {
let path = tempdir.path();
std::fs::write(path.join("test.obj"), b"").unwrap();
let str1 = format!("ATOM_NAME:{}:PREFIX", path.join("test.obj").display());
let prefix = PrefixMapCompilation::from_input(
&[("ATOM_NAME".to_string(), b"".to_vec())],
&[str1],
false,
);
let prefix =
PrefixMapCompilation::from_input(&[("ATOM_NAME".to_string(), b"".to_vec())], &[str1], true);
assert_eq!(
prefix.unwrap(),
PrefixMapCompilation {
@@ -1022,7 +1019,7 @@ fn link_exe_from_dir(
let entrypoint =
get_entrypoint(directory).with_context(|| anyhow::anyhow!("link exe from dir"))?;
let prefixes = PrefixMapCompilation::from_input(atoms, prefixes, true)
let prefixes = PrefixMapCompilation::from_input(atoms, prefixes, false)
.with_context(|| anyhow::anyhow!("link_exe_from_dir"))?;
let wasmer_main_c = generate_wasmer_main_c(&entrypoint, &prefixes).map_err(|e| {
@@ -1151,7 +1148,6 @@ fn link_exe_from_dir(
include_path.push("include");
cmd.arg(format!("-I{}", include_path.display()));
cmd.arg("-lunwind");
cmd.arg("-OReleaseSafe");
cmd.arg("-fno-compiler-rt");
cmd.arg("-fno-lto");
@@ -1590,12 +1586,7 @@ pub(super) mod utils {
fn find_libwasmer_in_files(target: &Triple, files: &[String]) -> Result<String, anyhow::Error> {
files
.iter()
.find(|f| f.ends_with("libwasmer-headless.a") || f.ends_with("wasmer-headless.lib"))
.or_else(|| {
files
.iter()
.find(|f| f.ends_with("libwasmer.a") || f.ends_with("wasmer.lib"))
})
.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)