Only use llvm in non windows envs

This commit is contained in:
Syrus 2019-03-07 18:26:29 -08:00
parent 7c2667ab0b
commit 3a4325c5a3
6 changed files with 15 additions and 9 deletions

1
Cargo.lock generated
View File

@ -1286,6 +1286,7 @@ dependencies = [
"wabt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmer-clif-backend 0.2.0",
"wasmer-emscripten 0.2.1",
"wasmer-llvm-backend 0.1.0",
"wasmer-runtime 0.2.1",
"wasmer-runtime-core 0.2.1",
]

View File

@ -26,7 +26,13 @@ wasmer-runtime = { path = "lib/runtime" }
wasmer-runtime-core = { path = "lib/runtime-core" }
wasmer-emscripten = { path = "lib/emscripten" }
[target.'cfg(not(windows))'.dependencies]
wasmer-llvm-backend = { path = "lib/llvm-backend" }
[workspace]
members = ["lib/clif-backend", "lib/runtime", "lib/runtime-core", "lib/emscripten", "lib/spectests", "lib/win-exception-handler", "lib/runtime-c-api"]
[target.'cfg(not(windows))'.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"]
[build-dependencies]

View File

@ -20,9 +20,11 @@ rand = "0.6"
[dev-dependencies]
wasmer-clif-backend = { path = "../clif-backend", version = "0.2.0" }
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.1.0" }
wabt = "0.7.2"
[target.'cfg(not(windows))'.dev-dependencies]
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.1.0" }
[build-dependencies]
glob = "0.2.11"

View File

@ -6,6 +6,7 @@ edition = "2018"
[dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.2.1" }
inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm7-0" }
wasmparser = "0.28.0"
hashbrown = "0.1.8"
smallvec = "0.6.8"
@ -14,12 +15,6 @@ libc = "0.2.49"
nix = "0.13.0"
capstone = { version = "0.5.0", optional = true }
[target.'cfg(windows)'.dependencies]
inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm5-0" }
[target.'cfg(not(windows))'.dependencies]
inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm7-0" }
[build-dependencies]
cc = "1.0"
lazy_static = "1.2.0"

View File

@ -25,7 +25,7 @@ tempfile = "3.0.7"
criterion = "0.2"
wabt = "0.7.4"
[dependencies.wasmer-llvm-backend]
[target.'cfg(not(windows))'.dependencies.wasmer-llvm-backend]
path = "../llvm-backend"
[features]

View File

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