@@ -736,27 +736,6 @@ download-rustc = false
736
736
if program_out_of_date ( & llvm_stamp, & key) && !self . dry_run ( ) {
737
737
self . download_ci_llvm ( & llvm_sha) ;
738
738
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
-
760
739
if self . should_fix_bins_and_dylibs ( ) {
761
740
for entry in t ! ( fs:: read_dir( llvm_root. join( "bin" ) ) ) {
762
741
self . fix_bin_or_dylib ( & t ! ( entry) . path ( ) ) ;
@@ -789,6 +768,26 @@ download-rustc = false
789
768
790
769
t ! ( fs:: write( llvm_stamp, key) ) ;
791
770
}
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
+ } ;
792
791
}
793
792
794
793
#[ cfg( not( feature = "bootstrap-self-test" ) ) ]
0 commit comments