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

Add bcrypt which is required by newer getrandom crate on Windows.

Browse Source
This commit is contained in:
Nick Lewycky
2021-02-10 17:52:12 -08:00
parent 2f4e915b76
commit e698ac32ee
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,9 +279,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("advapi32")
.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");

6
tests/integration/cli/src/link_code.rs
View File

@@ -50,7 +50,11 @@ impl LinkCode {
) )
.arg(&self.libwasmer_path.canonicalize()?); .arg(&self.libwasmer_path.canonicalize()?);
#[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");
#[cfg(not(windows))] #[cfg(not(windows))]
let command = command.arg("-ldl").arg("-lm").arg("-pthread"); let command = command.arg("-ldl").arg("-lm").arg("-pthread");
let output = command.arg("-o").arg(&self.output_path).output()?; let output = command.arg("-o").arg(&self.output_path).output()?;