Rustup to rustc 1.52.0-nightly (83b30a639 2021-02-20)

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 90f5429bb0e1ce8c93706dc0e835e0cd955d328f..9861af1f8eae2cfb384cbaee7ad709937835465a 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,40 +9,35 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime/", features = ["unwind"] }
-cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime/" }
-cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime/" }
-cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime/" }
-target-lexicon = "0.10.0"
-
-ar = "0.8.0"
-byteorder = "1.2.7"
+cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", features = ["unwind", "x64"] }
+cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main", optional = true }
+cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime/", branch = "main" }
+target-lexicon = "0.11.0"
+gimli = { version = "0.23.0", default-features = false, features = ["write"]}
+object = { version = "0.23.0", default-features = false, features = ["std", "read_core", "write", "coff", "elf", "macho", "pe"] }
+
+ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
 indexmap = "1.0.2"
-
-[dependencies.object]
-version = "0.18.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
+libloading = { version = "0.6.0", optional = true }
+smallvec = "1.6.1"
 
 # Uncomment to use local checkout of cranelift
 #[patch."https://github.com/bytecodealliance/wasmtime/"]
 #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-jit = { path = "../wasmtime/cranelift/jit" }
 #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.6.0"
+[features]
+default = ["jit", "inline_asm"]
+jit = ["cranelift-jit", "libloading"]
+inline_asm = []
 
 [profile.dev]
 # By compiling dependencies with optimizations, performing tests gets much faster.
@@ -52,6 +47,9 @@ opt-level = 3
 # Disabling optimizations for cg_clif itself makes compilation after a change faster.
 opt-level = 0
 
+[profile.release.package.rustc_codegen_cranelift]
+incremental = true
+
 # Disable optimizations and debuginfo of build scripts and some of the heavy build deps, as the
 # execution time of build scripts is so fast that optimizing them slows down the total build time.
 [profile.dev.build-override]