File tree 1 file changed +11
-1
lines changed
src/bootstrap/src/core/config
1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -1787,6 +1787,7 @@ impl Config {
1787
1787
download_ci_llvm,
1788
1788
build_config,
1789
1789
} = llvm;
1790
+
1790
1791
match ccache {
1791
1792
Some ( StringOrBool :: String ( ref s) ) => config. ccache = Some ( s. to_string ( ) ) ,
1792
1793
Some ( StringOrBool :: Bool ( true ) ) => {
@@ -2483,9 +2484,18 @@ impl Config {
2483
2484
llvm:: is_ci_llvm_available ( self , asserts)
2484
2485
}
2485
2486
} ;
2487
+
2486
2488
match download_ci_llvm {
2487
2489
None => self . channel == "dev" && if_unchanged ( ) ,
2488
- Some ( StringOrBool :: Bool ( b) ) => b,
2490
+ Some ( StringOrBool :: Bool ( b) ) => {
2491
+ if !b && self . download_rustc_commit . is_some ( ) {
2492
+ panic ! (
2493
+ "`llvm.download-ci-llvm` cannot be set to `false` if `rust.download-rustc` is set to `true` or `if-unchanged`."
2494
+ ) ;
2495
+ }
2496
+
2497
+ b
2498
+ }
2489
2499
// FIXME: "if-available" is deprecated. Remove this block later (around mid 2024)
2490
2500
// to not break builds between the recent-to-old checkouts.
2491
2501
Some ( StringOrBool :: String ( s) ) if s == "if-available" => {
You can’t perform that action at this time.
0 commit comments