Skip to content

Commit 87966f4

Browse files
committed
update cargo during test
1 parent 76c7224 commit 87966f4

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ impl Config {
503503
host: build_host_toml,
504504
target: build_target_toml,
505505
build_dir: build_build_dir_toml,
506-
cargo: build_cargo_toml,
506+
cargo: mut build_cargo_toml,
507507
rustc: mut build_rustc_toml,
508508
rustfmt: build_rustfmt_toml,
509509
cargo_clippy: build_cargo_clippy_toml,
@@ -672,9 +672,8 @@ impl Config {
672672
// Cargo in their bootstrap.toml.
673673
build_rustc_toml =
674674
build_rustc_toml.take().or(std::env::var_os("RUSTC").map(|p| p.into()));
675-
build_build_toml = build_build_toml
676-
.take()
677-
.or(std::env::var_os("CARGO").map(|p| p.into_string().unwrap()));
675+
build_cargo_toml =
676+
build_cargo_toml.take().or(std::env::var_os("CARGO").map(|p| p.into()));
678677
}
679678

680679
build_jobs_toml = flags_jobs.or(build_jobs_toml);

0 commit comments

Comments
 (0)