Skip to content

Commit 3e19b72

Browse files
authored
Merge pull request #3206 from ehuss/cargo-home-comment
Update comment about CARGO_HOME on Windows
2 parents b301b64 + 13f9ceb commit 3e19b72

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/toolchain.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -389,10 +389,11 @@ impl<'a> InstalledCommonToolchain<'a> {
389389
fn set_env(&self, cmd: &mut Command) {
390390
self.set_ldpath(cmd);
391391

392-
// Because rustup and cargo use slightly different
393-
// definitions of cargo home (rustup doesn't read HOME on
394-
// windows), we must set it here to ensure cargo and
395-
// rustup agree.
392+
// Older versions of Cargo used a slightly different definition of
393+
// cargo home. Rustup does not read HOME on Windows whereas the older
394+
// versions of Cargo did. Rustup and Cargo should be in sync now (both
395+
// using the same `home` crate), but this is retained to ensure cargo
396+
// and rustup agree in older versions.
396397
if let Ok(cargo_home) = utils::cargo_home() {
397398
cmd.env("CARGO_HOME", &cargo_home);
398399
}

0 commit comments

Comments
 (0)