Patch wasmtime-wasi to use this wasi-common version

This commit is contained in:
Jakub Konka
2019-06-25 12:19:42 +02:00
committed by Dan Gohman
parent 81b673f908
commit 656112d00b
3 changed files with 5 additions and 1161 deletions

View File

@@ -27,12 +27,16 @@ winapi = { version = "0.3", features=["std", "handleapi", "processthreadsapi", "
wasmtime-runtime = { git = "https://github.com/cranestation/wasmtime" } wasmtime-runtime = { git = "https://github.com/cranestation/wasmtime" }
wasmtime-environ = { git = "https://github.com/cranestation/wasmtime" } wasmtime-environ = { git = "https://github.com/cranestation/wasmtime" }
wasmtime-jit = { git = "https://github.com/cranestation/wasmtime" } wasmtime-jit = { git = "https://github.com/cranestation/wasmtime" }
wasmtime-wasi = { git = "https://github.com/cranestation/wasmtime" }
cranelift-codegen = "0.30.0" cranelift-codegen = "0.30.0"
cranelift-entity = "0.30.0" cranelift-entity = "0.30.0"
cranelift-wasm = "0.30.0" cranelift-wasm = "0.30.0"
cranelift-native = "0.30.0" cranelift-native = "0.30.0"
target-lexicon = "0.3.0" target-lexicon = "0.3.0"
[patch."https://github.com/CraneStation/wasi-common"]
wasi-common = { path = "." }
[lib] [lib]
name = "wasi_common" name = "wasi_common"
crate-type = ["rlib", "staticlib", "cdylib"] crate-type = ["rlib", "staticlib", "cdylib"]

View File

@@ -1,7 +1,4 @@
mod wasi;
use cranelift_codegen::settings; use cranelift_codegen::settings;
use cranelift_native;
use wasmtime_jit::Context; use wasmtime_jit::Context;
pub fn instantiate<S: AsRef<str>>( pub fn instantiate<S: AsRef<str>>(
@@ -35,7 +32,7 @@ pub fn instantiate<S: AsRef<str>>(
context.name_instance( context.name_instance(
"wasi_unstable".to_owned(), "wasi_unstable".to_owned(),
wasi::instantiate_wasi( wasmtime_wasi::instantiate_wasi(
"", "",
global_exports, global_exports,
&get_preopens(workspace)?, &get_preopens(workspace)?,

File diff suppressed because it is too large Load Diff