Skip to content

Commit c071101

Browse files
committed
make sure to populate DownloadState dependencies before its initialization in config parsing
1 parent db42d5b commit c071101

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,11 @@ impl Config {
797797
);
798798
}
799799

800+
config.patch_binaries_for_nix = patch_binaries_for_nix;
801+
config.bootstrap_cache_path = bootstrap_cache_path;
802+
config.llvm_assertions =
803+
toml.llvm.as_ref().is_some_and(|llvm| llvm.assertions.unwrap_or(false));
804+
800805
config.initial_rustc = if let Some(rustc) = rustc {
801806
if !flags_skip_stage0_validation {
802807
config.check_stage0_version(&rustc, "rustc");
@@ -867,7 +872,6 @@ impl Config {
867872
config.reuse = reuse.map(PathBuf::from);
868873
config.submodules = submodules;
869874
config.android_ndk = android_ndk;
870-
config.bootstrap_cache_path = bootstrap_cache_path;
871875
set(&mut config.low_priority, low_priority);
872876
set(&mut config.compiler_docs, compiler_docs);
873877
set(&mut config.library_docs_private_items, library_docs_private_items);
@@ -886,7 +890,6 @@ impl Config {
886890
set(&mut config.local_rebuild, local_rebuild);
887891
set(&mut config.print_step_timings, print_step_timings);
888892
set(&mut config.print_step_rusage, print_step_rusage);
889-
config.patch_binaries_for_nix = patch_binaries_for_nix;
890893

891894
config.verbose = cmp::max(config.verbose, flags_verbose as usize);
892895

@@ -895,9 +898,6 @@ impl Config {
895898

896899
config.apply_install_config(toml.install);
897900

898-
config.llvm_assertions =
899-
toml.llvm.as_ref().is_some_and(|llvm| llvm.assertions.unwrap_or(false));
900-
901901
let file_content = t!(fs::read_to_string(config.src.join("src/ci/channel")));
902902
let ci_channel = file_content.trim_end();
903903

0 commit comments

Comments
 (0)