Don't hard-code rustc path in get_rustc_version and get_default_sysroot

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 87173f26e2689be500dff579b1561b0338807866..f03cc34a81081b2acc79fbac7651fff575080a6e 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,28 +3,35 @@ name = "rustc_codegen_cranelift"
 version = "0.1.0"
 edition = "2021"
 
+[[bin]]
+# This is used just to teach rust-analyzer how to check the build system. required-features is used
+# to disable it for regular builds.
+name = "y"
+path = "./y.rs"
+required-features = ["__check_build_system_using_ra"]
+
 [lib]
 crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { version = "0.78.0", features = ["unwind", "all-arch"] }
-cranelift-frontend = "0.78.0"
-cranelift-module = "0.78.0"
-cranelift-native = "0.78.0"
-cranelift-jit = { version = "0.78.0", optional = true }
-cranelift-object = "0.78.0"
+cranelift-codegen = { version = "0.91", features = ["unwind", "all-arch"] }
+cranelift-frontend = "0.91"
+cranelift-module = "0.91"
+cranelift-native = "0.91"
+cranelift-jit = { version = "0.91", optional = true }
+cranelift-object = "0.91"
 target-lexicon = "0.12.0"
-gimli = { version = "0.25.0", default-features = false, features = ["write"]}
-object = { version = "0.27.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
+gimli = { version = "0.26.0", default-features = false, features = ["write"]}
+object = { version = "0.29.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
 
-ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
-indexmap = "1.0.2"
-libloading = { version = "0.6.0", optional = true }
-smallvec = "1.6.1"
+indexmap = "1.9.1"
+libloading = { version = "0.7.3", optional = true }
+once_cell = "1.10.0"
+smallvec = "1.8.1"
 
+[patch.crates-io]
 # Uncomment to use local checkout of cranelift
-#[patch."https://github.com/bytecodealliance/wasmtime.git"]
 #cranelift-codegen = { path = "../wasmtime/cranelift/codegen" }
 #cranelift-frontend = { path = "../wasmtime/cranelift/frontend" }
 #cranelift-module = { path = "../wasmtime/cranelift/module" }
@@ -32,7 +39,6 @@ smallvec = "1.6.1"
 #cranelift-jit = { path = "../wasmtime/cranelift/jit" }
 #cranelift-object = { path = "../wasmtime/cranelift/object" }
 
-#[patch.crates-io]
 #gimli = { path = "../" }
 
 [features]
@@ -40,35 +46,7 @@ smallvec = "1.6.1"
 unstable-features = ["jit", "inline_asm"]
 jit = ["cranelift-jit", "libloading"]
 inline_asm = []
-
-[profile.dev]
-# By compiling dependencies with optimizations, performing tests gets much faster.
-opt-level = 3
-
-[profile.dev.package.rustc_codegen_cranelift]
-# 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]
-opt-level = 0
-debug = false
-
-[profile.release.build-override]
-opt-level = 0
-debug = false
-
-[profile.dev.package.cranelift-codegen-meta]
-opt-level = 0
-debug = false
-
-[profile.release.package.cranelift-codegen-meta]
-opt-level = 0
-debug = false
+__check_build_system_using_ra = []
 
 [package.metadata.rust-analyzer]
 rustc_private = true