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

Merge branch 'master' into feature/vfs

Browse Source
This commit is contained in:
Mackenzie Clark
2019-03-13 14:25:14 -07:00
parent c1e0d325e3 093757519e
commit bd697487aa
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@@ -28,7 +28,7 @@ wasmer-emscripten = { path = "lib/emscripten" }
wasmer-runtime-abi = { path = "lib/runtime-abi", optional = true }
[target.'cfg(not(windows))'.dependencies]
wasmer-llvm-backend = { path = "lib/llvm-backend" }
wasmer-llvm-backend = { path = "lib/llvm-backend", optional = true }
[workspace]
members = ["lib/clif-backend", "lib/runtime", "lib/runtime-core", "lib/emscripten", "lib/spectests", "lib/win-exception-handler", "lib/runtime-c-api", "lib/llvm-backend", "lib/runtime-abi"]
@@ -41,5 +41,7 @@ glob = "0.2.11"
default = ["fast-tests"]
vfs = ["wasmer-runtime-abi", "wasmer-emscripten/vfs"]
debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"]
default = ["fast-tests"]
# This feature will allow cargo test to run much faster
fast-tests = []
llvm = ["wasmer-llvm-backend"]

4
lib/emscripten/src/syscalls/windows.rs
View File

@@ -42,8 +42,8 @@ pub fn ___syscall5(ctx: &mut Ctx, which: c_int, mut varargs: VarArgs) -> c_int {
emscripten_memory_pointer!(ctx.memory(0), urandom_file_offset) as *const i8;
let fd = unsafe { open(raw_pointer_to_urandom_file, flags, mode) };
debug!(
"=> pathname: {}, flags: {}, mode: {} = fd: {}\npath: {}",
pathname, flags, mode, fd, s
"=> pathname: {}, flags: {}, mode: {} = fd: {}",
pathname, flags, mode, fd
);
fd
}

2
lib/runtime/Cargo.toml
View File

@@ -27,9 +27,11 @@ wabt = "0.7.4"
[target.'cfg(not(windows))'.dependencies.wasmer-llvm-backend]
path = "../llvm-backend"
optional = true
[features]
debug = ["wasmer-clif-backend/debug", "wasmer-runtime-core/debug"]
llvm = ["wasmer-llvm-backend"]
[[bench]]
name = "nginx"

6
lib/spectests/Cargo.toml
View File

@@ -18,11 +18,11 @@ wabt = "0.7.2"
wasmer-clif-backend = { path = "../clif-backend", version = "0.2.0" }
wabt = "0.7.2"
[target.'cfg(not(windows))'.dev-dependencies]
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.1.0" }
[target.'cfg(not(windows))'.dependencies]
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.1.0", optional = true }
[features]
default = ["fast-tests"]
fast-tests = []
clif = []
llvm = []
llvm = ["wasmer-llvm-backend"]