File tree 1 file changed +3
-5
lines changed
src/bootstrap/src/core/config
1 file changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -2346,18 +2346,15 @@ impl Config {
2346
2346
self . download_ci_rustc ( commit) ;
2347
2347
2348
2348
if let Some ( config_path) = & self . config {
2349
- let builder_config_path =
2350
- self . out . join ( self . build . triple ) . join ( "ci-rustc" ) . join ( BUILDER_CONFIG_FILENAME ) ;
2351
-
2352
- let ci_config_toml = match Self :: get_toml ( & builder_config_path) {
2349
+ let ci_config_toml = match self . get_builder_toml ( "ci-rustc" ) {
2353
2350
Ok ( ci_config_toml) => ci_config_toml,
2354
2351
Err ( e) if e. to_string ( ) . contains ( "unknown field" ) => {
2355
2352
println ! ( "WARNING: CI rustc has some fields that are no longer supported in bootstrap; download-rustc will be disabled." ) ;
2356
2353
println ! ( "HELP: Consider rebasing to a newer commit if available." ) ;
2357
2354
return None ;
2358
2355
} ,
2359
2356
Err ( e) => {
2360
- eprintln ! ( "ERROR: Failed to parse CI rustc config at '{}' : {e}" , builder_config_path . display ( ) ) ;
2357
+ eprintln ! ( "ERROR: Failed to parse CI rustc config.toml : {e}" ) ;
2361
2358
exit ! ( 2 ) ;
2362
2359
} ,
2363
2360
} ;
@@ -2823,6 +2820,7 @@ impl Config {
2823
2820
2824
2821
/// Compares the current `Llvm` options against those in the CI LLVM builder and detects any incompatible options.
2825
2822
/// It does this by destructuring the `Llvm` instance to make sure every `Llvm` field is covered and not missing.
2823
+ #[ cfg( not( test) ) ]
2826
2824
pub ( crate ) fn check_incompatible_options_for_ci_llvm (
2827
2825
current_config_toml : TomlConfig ,
2828
2826
ci_config_toml : TomlConfig ,
You can’t perform that action at this time.
0 commit comments