File tree Expand file tree Collapse file tree 1 file changed +5
-6
lines changed
src/bootstrap/src/core/config Expand file tree Collapse file tree 1 file changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -2738,6 +2738,8 @@ impl Config {
27382738 download_ci_llvm : Option < StringOrBool > ,
27392739 asserts : bool ,
27402740 ) -> bool {
2741+ let download_ci_llvm = download_ci_llvm. unwrap_or ( StringOrBool :: Bool ( true ) ) ;
2742+
27412743 let if_unchanged = || {
27422744 if self . rust_info . is_from_tarball ( ) {
27432745 // Git is needed for running "if-unchanged" logic.
@@ -2761,10 +2763,7 @@ impl Config {
27612763 } ;
27622764
27632765 match download_ci_llvm {
2764- None => {
2765- ( self . channel == "dev" || self . download_rustc_commit . is_some ( ) ) && if_unchanged ( )
2766- }
2767- Some ( StringOrBool :: Bool ( b) ) => {
2766+ StringOrBool :: Bool ( b) => {
27682767 if !b && self . download_rustc_commit . is_some ( ) {
27692768 panic ! (
27702769 "`llvm.download-ci-llvm` cannot be set to `false` if `rust.download-rustc` is set to `true` or `if-unchanged`."
@@ -2774,8 +2773,8 @@ impl Config {
27742773 // If download-ci-llvm=true we also want to check that CI llvm is available
27752774 b && llvm:: is_ci_llvm_available ( self , asserts)
27762775 }
2777- Some ( StringOrBool :: String ( s) ) if s == "if-unchanged" => if_unchanged ( ) ,
2778- Some ( StringOrBool :: String ( other) ) => {
2776+ StringOrBool :: String ( s) if s == "if-unchanged" => if_unchanged ( ) ,
2777+ StringOrBool :: String ( other) => {
27792778 panic ! ( "unrecognized option for download-ci-llvm: {:?}" , other)
27802779 }
27812780 }
You can’t perform that action at this time.
0 commit comments