Skip to content

Commit ea34bb0

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

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
@@ -736,27 +736,6 @@ download-rustc = false
736736
if program_out_of_date(&llvm_stamp, &key) && !self.dry_run() {
737737
self.download_ci_llvm(&llvm_sha);
738738

739-
if let Some(config_path) = &self.config {
740-
let current_config_toml = Self::get_toml(config_path).unwrap();
741-
742-
match self.get_builder_toml("ci-llvm") {
743-
Ok(ci_config_toml) => {
744-
check_incompatible_options_for_ci_llvm(current_config_toml, ci_config_toml)
745-
.unwrap();
746-
}
747-
Err(e) if e.to_string().contains("unknown field") => {
748-
println!(
749-
"WARNING: CI rustc has some fields that are no longer supported in bootstrap; download-rustc will be disabled."
750-
);
751-
println!("HELP: Consider rebasing to a newer commit if available.");
752-
}
753-
Err(e) => {
754-
eprintln!("ERROR: Failed to parse CI LLVM config.toml: {e}");
755-
exit!(2);
756-
}
757-
};
758-
};
759-
760739
if self.should_fix_bins_and_dylibs() {
761740
for entry in t!(fs::read_dir(llvm_root.join("bin"))) {
762741
self.fix_bin_or_dylib(&t!(entry).path());
@@ -789,6 +768,26 @@ download-rustc = false
789768

790769
t!(fs::write(llvm_stamp, key));
791770
}
771+
772+
if let Some(config_path) = &self.config {
773+
let current_config_toml = Self::get_toml(config_path).unwrap();
774+
775+
match self.get_builder_toml("ci-llvm") {
776+
Ok(ci_config_toml) => {
777+
t!(check_incompatible_options_for_ci_llvm(current_config_toml, ci_config_toml));
778+
}
779+
Err(e) if e.to_string().contains("unknown field") => {
780+
println!(
781+
"WARNING: CI LLVM has some fields that are no longer supported in bootstrap; download-ci-llvm will be disabled."
782+
);
783+
println!("HELP: Consider rebasing to a newer commit if available.");
784+
}
785+
Err(e) => {
786+
eprintln!("ERROR: Failed to parse CI LLVM config.toml: {e}");
787+
exit!(2);
788+
}
789+
};
790+
};
792791
}
793792

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

0 commit comments

Comments
 (0)