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

Fixed create_exe unwanted changes

Browse Source
This commit is contained in:
Syrus Akbary
2021-03-03 21:50:58 -08:00
parent 392f50a1af
commit f41b22cff5
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,14 +148,20 @@ fn generate_header(header_file_src: &[u8]) -> anyhow::Result<()> {
.open(&header_file_path)?; .open(&header_file_path)?;
use std::io::Write; use std::io::Write;
header.write(header_file_src)?; header.write_all(header_file_src)?;
Ok(()) Ok(())
} }
fn get_wasmer_dir() -> anyhow::Result<PathBuf> { fn get_wasmer_dir() -> anyhow::Result<PathBuf> {
Ok(PathBuf::from( Ok(PathBuf::from(
env::var("WASMER_DIR").context("Trying to read env var `WASMER_DIR`")?, 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`")?,
)) ))
} }
@@ -279,9 +285,13 @@ impl LinkCode {
command command
}; };
// Add libraries required per platform. // Add libraries required per platform.
// We need userenv, sockets (Ws2_32), and advapi32 to call a system call (for random numbers I think). // We need userenv, sockets (Ws2_32), advapi32 for some system calls and bcrypt for random numbers.
#[cfg(windows)] #[cfg(windows)]
let command = command.arg("-luserenv").arg("-lWs2_32").arg("-ladvapi32"); let command = command
.arg("-luserenv")
.arg("-lWs2_32")
.arg("-ladvapi32")
.arg("-lbcrypt");
// On unix we need dlopen-related symbols, libmath for a few things, and pthreads. // On unix we need dlopen-related symbols, libmath for a few things, and pthreads.
#[cfg(not(windows))] #[cfg(not(windows))]
let command = command.arg("-ldl").arg("-lm").arg("-pthread"); let command = command.arg("-ldl").arg("-lm").arg("-pthread");