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

Fix windows-gnu create-exe

Browse Source
This commit is contained in:
Felix Schütt
2022-11-18 11:35:57 +01:00
parent 9bedc0a8f7
commit a81344e29d
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -407,12 +407,7 @@ impl CreateExe {
v.canonicalize().unwrap_or(v)
} else {
{
let os = target_triple.unwrap_or(Triple::host()).operating_system;
let libwasmer_path = if os == OperatingSystem::Windows {
"lib/wasmer.lib"
} else {
"lib/libwasmer.a"
};
let libwasmer_path = "lib/libwasmer.a";
let tarball_dir;
let filename = if let Some(local_tarball) = cross_subc.tarball.as_ref() {
let target_file_path = local_tarball
@@ -571,23 +566,31 @@ impl CreateExe {
cmd.arg(&zig_triple);
cmd.arg(&format!("-I{}/", include_dir.display()));
cmd.arg(&format!("-I{}/", header_code_path.display()));
cmd.arg("--library");
cmd.arg("c");
if zig_triple.contains("windows") {
cmd.arg("-lc++");
} else {
cmd.arg("-lc");
}
cmd.arg("-lunwind");
cmd.arg("-OReleaseSafe");
cmd.arg("-fstrip");
cmd.arg("-dead_strip");
cmd.arg("-dead_strip_dylibs");
cmd.arg("--verbose-cc");
cmd.arg("-fno-compiler-rt");
cmd.arg(&format!("-femit-bin={}", output_path.display()));
if !zig_triple.contains("windows") {
cmd.arg("-lunwind");
}
cmd.arg(&object_path);
cmd.arg(&c_src_path);
cmd.arg(libwasmer_path.join(lib_filename));
cmd.arg(libwasmer_path.join(&lib_filename));
if zig_triple.contains("windows") {
let mut libwasmer_parent = libwasmer_path.clone();
libwasmer_parent.pop();
cmd.arg(libwasmer_parent.join("winsdk/ADVAPI32.lib"));
cmd.arg(libwasmer_parent.join("winsdk/BCRYPT.lib"));
cmd.arg(libwasmer_parent.join("winsdk/KERNEL32.lib"));
cmd.arg(libwasmer_parent.join("winsdk/USERENV.lib"));
cmd.arg(libwasmer_parent.join("winsdk/WS2_32.lib"));
}
if let Some(volume_obj) = pirita_volume_path.as_ref() {
cmd.arg(volume_obj.clone());
}

22
tests/integration/cli/tests/run.rs
View File

@@ -37,14 +37,15 @@ fn test_cross_compile_python_windows() -> anyhow::Result<()> {
for t in targets {
let python_wasmer_path = temp_dir.path().join(format!("{t}-python"));
let output = Command::new(get_wasmer_path())
.arg("create-exe")
.arg(wasi_test_python_path())
.arg("--target")
.arg(t)
.arg("-o")
.arg(python_wasmer_path.clone())
.output()?;
let mut output = Command::new(get_wasmer_path());
output.arg("create-exe");
output.arg(wasi_test_python_path());
output.arg("--target");
output.arg(t);
output.arg("-o");
output.arg(python_wasmer_path.clone());
let output = output.output()?;
let stdout = std::str::from_utf8(&output.stdout)
.expect("stdout is not utf8! need to handle arbitrary bytes");
@@ -64,7 +65,10 @@ fn test_cross_compile_python_windows() -> anyhow::Result<()> {
.unwrap()
.filter_map(|e| Some(e.ok()?.path()))
.collect::<Vec<_>>();
panic!("target {t} was not compiled correctly {stdout} {stderr}, tempdir: {:#?}", p);
panic!(
"target {t} was not compiled correctly {stdout} {stderr}, tempdir: {:#?}",
p
);
}
}