Merge pull request #1079 from CohenArthur/fmt-master

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 0f89f03432aa6d734c87ffb219f883bb73c850e2..858a0f0e33e3f7ca48dcd0abdf470b6eed35c285 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,40 +9,37 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime/" }
-cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime/" }
-cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime/" }
-cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime/" }
+cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", features = ["unwind"] }
+cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+cranelift-simplejit = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", optional = true }
+cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
 target-lexicon = "0.10.0"
+gimli = { version = "0.21.0", default-features = false, features = ["write"]}
+object = { version = "0.21.1", default-features = false, features = ["read", "std", "write"] }
 
-ar = "0.8.0"
+ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
 byteorder = "1.2.7"
 indexmap = "1.0.2"
-
-[dependencies.object]
-version = "0.17.0"
-default-features = false
-features = ["read", "std", "write"] # We don't need WASM support
-
-[dependencies.gimli]
-version = "0.20.0"
-default-features = false
-features = ["write"] # We don't need read support
+cfg-if = "0.1.10"
+libloading = { version = "0.6.0", optional = true }
+hashbrown = "0.8.1"
 
 # Uncomment to use local checkout of cranelift
 #[patch."https://github.com/bytecodealliance/wasmtime/"]
-#cranelift-codegen = { path = "../wasmtime/cranelift/cranelift-codegen" }
-#cranelift-frontend = { path = "../wasmtime/cranelift/cranelift-frontend" }
-#cranelift-module = { path = "../wasmtime/cranelift/cranelift-module" }
-#cranelift-simplejit = { path = "../wasmtime/cranelift/cranelift-simplejit" }
-#cranelift-object = { path = "../wasmtime/cranelift/cranelift-object" }
+#cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
+#cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
+#cranelift-module = { path = "../wasmtime/cranelift/module" }
+#cranelift-simplejit = { path = "../wasmtime/cranelift/simplejit" }
+#cranelift-object = { path = "../wasmtime/cranelift/object" }
 
 #[patch.crates-io]
 #gimli = { path = "../" }
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-cranelift-simplejit = { git = "https://github.com/bytecodealliance/wasmtime/" }
-libloading = "0.5.1"
+[features]
+default = ["jit", "inline_asm"]
+jit = ["cranelift-simplejit", "libloading"]
+inline_asm = []
 
 [profile.dev]
 # By compiling dependencies with optimizations, performing tests gets much faster.