Skip to content

Commit cb47525

Browse files
committed
print incompatible options even if we don't download
Signed-off-by: onur-ozkan <[email protected]>
1 parent 0464a08 commit cb47525

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

src/bootstrap/src/core/download.rs

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -719,27 +719,6 @@ download-rustc = false
719719
if program_out_of_date(&llvm_stamp, &key) && !self.dry_run() {
720720
self.download_ci_llvm(&llvm_sha);
721721

722-
if let Some(config_path) = &self.config {
723-
let current_config_toml = Self::get_toml(config_path).unwrap();
724-
725-
match self.get_builder_toml("ci-llvm") {
726-
Ok(ci_config_toml) => {
727-
check_incompatible_options_for_ci_llvm(current_config_toml, ci_config_toml)
728-
.unwrap();
729-
}
730-
Err(e) if e.to_string().contains("unknown field") => {
731-
println!(
732-
"WARNING: CI rustc has some fields that are no longer supported in bootstrap; download-rustc will be disabled."
733-
);
734-
println!("HELP: Consider rebasing to a newer commit if available.");
735-
}
736-
Err(e) => {
737-
eprintln!("ERROR: Failed to parse CI LLVM config.toml: {e}");
738-
exit!(2);
739-
}
740-
};
741-
};
742-
743722
if self.should_fix_bins_and_dylibs() {
744723
for entry in t!(fs::read_dir(llvm_root.join("bin"))) {
745724
self.fix_bin_or_dylib(&t!(entry).path());
@@ -772,6 +751,26 @@ download-rustc = false
772751

773752
t!(fs::write(llvm_stamp, key));
774753
}
754+
755+
if let Some(config_path) = &self.config {
756+
let current_config_toml = Self::get_toml(config_path).unwrap();
757+
758+
match self.get_builder_toml("ci-llvm") {
759+
Ok(ci_config_toml) => {
760+
t!(check_incompatible_options_for_ci_llvm(current_config_toml, ci_config_toml));
761+
}
762+
Err(e) if e.to_string().contains("unknown field") => {
763+
println!(
764+
"WARNING: CI LLVM has some fields that are no longer supported in bootstrap; download-ci-llvm will be disabled."
765+
);
766+
println!("HELP: Consider rebasing to a newer commit if available.");
767+
}
768+
Err(e) => {
769+
eprintln!("ERROR: Failed to parse CI LLVM config.toml: {e}");
770+
exit!(2);
771+
}
772+
};
773+
};
775774
}
776775

777776
#[cfg(not(feature = "bootstrap-self-test"))]

0 commit comments

Comments
 (0)