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

Fix compilation issue in create-exe function

Browse Source
This commit is contained in:
Felix Schütt
2022-11-30 18:37:28 +01:00
parent 80b7cb99f6
commit 2c254a55cc
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,7 +439,7 @@ impl CreateExe {
.canonicalize()
.unwrap_or_else(|_| target_file_path.clone());
let files = untar(tarball, target_file_path)?;
files.into_iter().find(|f| f.ends_with("libwasmer.a")).ok_or_else(|| {
files.iter().find(|f| f.ends_with("libwasmer.a")).cloned().ok_or_else(|| {
anyhow!("Could not find libwasmer for {} target in the fetched release from Github: you can download it manually and specify its path with the --cross-compilation-library-path LIBRARY_PATH flag. (files = {files:#?}", target)})?
}
#[cfg(not(feature = "http"))]

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

@@ -33,11 +33,7 @@ fn test_cross_compile_python_windows() -> anyhow::Result<()> {
"x86_64-windows-gnu",
];
let compilers = &[
"cranelift",
"singlepass",
"llvm",
];
let compilers = &["cranelift", "singlepass", "llvm"];
for t in targets {
for c in compilers {
@@ -45,7 +41,7 @@ fn test_cross_compile_python_windows() -> anyhow::Result<()> {
let python_wasmer_path = temp_dir.path().join(format!("{t}-python"));
let mut output = Command::new(get_wasmer_path());
output.arg("create-exe");
output.arg(wasi_test_python_path());
output.arg("--target");
@@ -54,20 +50,20 @@ fn test_cross_compile_python_windows() -> anyhow::Result<()> {
output.arg(python_wasmer_path.clone());
output.arg(format!("--{c}"));
let output = output.output()?;
let stdout = std::str::from_utf8(&output.stdout)
.expect("stdout is not utf8! need to handle arbitrary bytes");
let stderr = std::str::from_utf8(&output.stderr)
.expect("stderr is not utf8! need to handle arbitrary bytes");
if !output.status.success() {
bail!("linking failed with: stdout: {stdout}\n\nstderr: {stderr}");
}
println!("stdout: {stdout}");
println!("stderr: {stderr}");
if !python_wasmer_path.exists() {
let p = std::fs::read_dir(temp_dir.path())
.unwrap()