Merge branch 'master' into feature/vfs

Cargo.toml

@@ -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"]

lib/emscripten/src/syscalls/windows.rs

@@ -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
         }

lib/runtime/Cargo.toml

@@ -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"

lib/spectests/Cargo.toml

@@ -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"]