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

Undo changes, recomment out failing tests + add link to zig bug report

Browse Source
This commit is contained in:
Felix Schütt
2022-12-01 19:46:24 +01:00
parent 991ad55bdb
commit 5d4817c4a1
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -579,9 +579,6 @@ impl CreateExe {
pirita_main_atom: Option<&str>,
pirita_volume_path: Option<PathBuf>,
) -> anyhow::Result<()> {
println!("compile zig {:?}", setup);
let tempdir = tempdir::TempDir::new("wasmer-static-compile-zig")?;
let tempdir_path = tempdir.path();
let c_src_path = tempdir_path.join("wasmer_main.c");
@@ -644,7 +641,6 @@ impl CreateExe {
cmd.arg("-lc");
}
cmd.arg("-lunwind");
cmd.arg("-OReleaseSafe");
cmd.arg("-fno-compiler-rt");
cmd.arg(&format!("-femit-bin={}", output_path.display()));
@@ -652,16 +648,7 @@ impl CreateExe {
cmd.arg(o);
}
cmd.arg(&c_src_path);
if zig_triple != "x86_64-macos-none" {
cmd.arg(libwasmer_path.join(&lib_filename));
} else {
// cmd.arg("/Users/fs/Development/wasmer/target/x86_64-apple-darwin/release/libwasmer.a");
for file in std::fs::read_dir("/Users/fs/Development/wasmer/target/x86_64-apple-darwin/release/objects").unwrap() {
let path = file.unwrap().path().canonicalize().unwrap();
println!("linking {}", path.display());
cmd.arg(path);
}
}
cmd.arg(libwasmer_path.join(&lib_filename));
if zig_triple.contains("windows") {
let mut libwasmer_parent = libwasmer_path.clone();
libwasmer_parent.pop();