This repository was archived by the owner on May 28, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +14
-3
lines changed
src/bootstrap/src/core/config Expand file tree Collapse file tree 2 files changed +14
-3
lines changed Original file line number Diff line number Diff line change 5050#
5151# Note that many of the LLVM options are not currently supported for
5252# downloading. Currently only the "assertions" option can be toggled.
53- # download-ci-llvm = if rust.channel == "dev" { "if-unchanged" } else { false }
53+ # download-ci-llvm = if rust.channel == "dev" || rust.download-rustc != false { "if-unchanged" } else { false }
5454
5555# Indicates whether the LLVM build is a Release or Debug build
5656# optimize = true
Original file line number Diff line number Diff line change @@ -2483,9 +2483,20 @@ impl Config {
24832483 llvm:: is_ci_llvm_available ( self , asserts)
24842484 }
24852485 } ;
2486+
24862487 match download_ci_llvm {
2487- None => self . channel == "dev" && if_unchanged ( ) ,
2488- Some ( StringOrBool :: Bool ( b) ) => b,
2488+ None => {
2489+ ( self . channel == "dev" || self . download_rustc_commit . is_some ( ) ) && if_unchanged ( )
2490+ }
2491+ Some ( StringOrBool :: Bool ( b) ) => {
2492+ if !b && self . download_rustc_commit . is_some ( ) {
2493+ panic ! (
2494+ "`llvm.download-ci-llvm` cannot be set to `false` if `rust.download-rustc` is set to `true` or `if-unchanged`."
2495+ ) ;
2496+ }
2497+
2498+ b
2499+ }
24892500 // FIXME: "if-available" is deprecated. Remove this block later (around mid 2024)
24902501 // to not break builds between the recent-to-old checkouts.
24912502 Some ( StringOrBool :: String ( s) ) if s == "if-available" => {
You can’t perform that action at this time.
0 commit comments