File tree Expand file tree Collapse file tree 1 file changed +3
-4
lines changed
src/bootstrap/src/core/config Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -551,7 +551,7 @@ impl Config {
551551 host : build_host_toml,
552552 target : build_target_toml,
553553 build_dir : build_build_dir_toml,
554- cargo : build_cargo_toml,
554+ cargo : mut build_cargo_toml,
555555 rustc : mut build_rustc_toml,
556556
557557 rustfmt : build_rustfmt_toml,
@@ -756,9 +756,8 @@ impl Config {
756756 // Cargo in their bootstrap.toml.
757757 build_rustc_toml =
758758 build_rustc_toml. take ( ) . or ( std:: env:: var_os ( "RUSTC" ) . map ( |p| p. into ( ) ) ) ;
759- build_build_toml = build_build_toml
760- . take ( )
761- . or ( std:: env:: var_os ( "CARGO" ) . map ( |p| p. into_string ( ) . unwrap ( ) ) ) ;
759+ build_cargo_toml =
760+ build_cargo_toml. take ( ) . or ( std:: env:: var_os ( "CARGO" ) . map ( |p| p. into ( ) ) ) ;
762761 }
763762
764763 build_jobs_toml = flags_jobs. or ( build_jobs_toml) ;
You can’t perform that action at this time.
0 commit comments