From b7e6537935d421afd7e02585aaa5cec92bee63b0 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sun, 9 May 2021 00:07:04 +0200 Subject: Use RUSTC_BOOTSTRAP=1 instead of +nightly when discovering rust_cfgs throughs cargo --- crates/project_model/src/cargo_workspace.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'crates/project_model/src/cargo_workspace.rs') diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project_model/src/cargo_workspace.rs index f1ad00d36..b18699b77 100644 --- a/crates/project_model/src/cargo_workspace.rs +++ b/crates/project_model/src/cargo_workspace.rs @@ -375,14 +375,10 @@ fn rustc_discover_host_triple(cargo_toml: &AbsPath) -> Option { fn cargo_config_build_target(cargo_toml: &AbsPath) -> Option { let mut cargo_config = Command::new(toolchain::cargo()); - cargo_config.current_dir(cargo_toml.parent().unwrap()).args(&[ - "+nightly", - "-Z", - "unstable-options", - "config", - "get", - "build.target", - ]); + cargo_config + .current_dir(cargo_toml.parent().unwrap()) + .args(&["-Z", "unstable-options", "config", "get", "build.target"]) + .env("RUSTC_BOOTSTRAP", "1"); // if successful we receive `build.target = "target-triple"` log::debug!("Discovering cargo config target by {:?}", cargo_config); match utf8_stdout(cargo_config) { -- cgit v1.2.3