diff options
| author | bit-aloo <sshourya17@gmail.com> | 2025-07-28 22:23:56 +0530 |
|---|---|---|
| committer | bit-aloo <sshourya17@gmail.com> | 2025-07-28 22:23:56 +0530 |
| commit | c071101da73c417612155eb44e4cf4b9b3ee7499 (patch) | |
| tree | 986e29621e7ed954fce839af02eccd85c7e6ded6 | |
| parent | db42d5b36c804be21efd9c537a5a6771ec1c8201 (diff) | |
| download | rust-c071101da73c417612155eb44e4cf4b9b3ee7499.tar.gz rust-c071101da73c417612155eb44e4cf4b9b3ee7499.zip | |
make sure to populate DownloadState dependencies before its initialization in config parsing
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 90001f9ae31..9644ade00b3 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -797,6 +797,11 @@ impl Config { ); } + config.patch_binaries_for_nix = patch_binaries_for_nix; + config.bootstrap_cache_path = bootstrap_cache_path; + config.llvm_assertions = + toml.llvm.as_ref().is_some_and(|llvm| llvm.assertions.unwrap_or(false)); + config.initial_rustc = if let Some(rustc) = rustc { if !flags_skip_stage0_validation { config.check_stage0_version(&rustc, "rustc"); @@ -867,7 +872,6 @@ impl Config { config.reuse = reuse.map(PathBuf::from); config.submodules = submodules; config.android_ndk = android_ndk; - config.bootstrap_cache_path = bootstrap_cache_path; set(&mut config.low_priority, low_priority); set(&mut config.compiler_docs, compiler_docs); set(&mut config.library_docs_private_items, library_docs_private_items); @@ -886,7 +890,6 @@ impl Config { set(&mut config.local_rebuild, local_rebuild); set(&mut config.print_step_timings, print_step_timings); set(&mut config.print_step_rusage, print_step_rusage); - config.patch_binaries_for_nix = patch_binaries_for_nix; config.verbose = cmp::max(config.verbose, flags_verbose as usize); @@ -895,9 +898,6 @@ impl Config { config.apply_install_config(toml.install); - config.llvm_assertions = - toml.llvm.as_ref().is_some_and(|llvm| llvm.assertions.unwrap_or(false)); - let file_content = t!(fs::read_to_string(config.src.join("src/ci/channel"))); let ci_channel = file_content.trim_end(); |
