Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project-model/src/env.rs')
| -rw-r--r-- | crates/project-model/src/env.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/project-model/src/env.rs b/crates/project-model/src/env.rs index 37fffba295..f2e5df171a 100644 --- a/crates/project-model/src/env.rs +++ b/crates/project-model/src/env.rs @@ -4,7 +4,7 @@ use paths::Utf8Path; use rustc_hash::FxHashMap; use toolchain::Tool; -use crate::{utf8_stdout, ManifestPath, PackageData, Sysroot, TargetKind}; +use crate::{ManifestPath, PackageData, Sysroot, TargetKind, utf8_stdout}; /// Recreates the compile-time environment variables that Cargo sets. /// @@ -62,11 +62,10 @@ pub(crate) fn inject_rustc_tool_env(env: &mut Env, cargo_name: &str, kind: Targe pub(crate) fn cargo_config_env( manifest: &ManifestPath, - extra_env: &FxHashMap<String, String>, + extra_env: &FxHashMap<String, Option<String>>, sysroot: &Sysroot, ) -> Env { - let mut cargo_config = sysroot.tool(Tool::Cargo, manifest.parent()); - cargo_config.envs(extra_env); + let mut cargo_config = sysroot.tool(Tool::Cargo, manifest.parent(), extra_env); cargo_config .args(["-Z", "unstable-options", "config", "get", "env"]) .env("RUSTC_BOOTSTRAP", "1"); |