File tree 4 files changed +12
-2
lines changed
4 files changed +12
-2
lines changed Original file line number Diff line number Diff line change 42
42
# Unless you're developing for a target where Rust CI doesn't build a compiler
43
43
# toolchain or changing LLVM locally, you probably want to leave this enabled.
44
44
#
45
+ # Set this to `"true"` to download if CI llvm available otherwise it builds
46
+ # from `src/llvm-project`.
47
+ #
45
48
# Set this to `"if-unchanged"` to download only if the llvm-project has not
46
49
# been modified. You can also use this if you are unsure whether you're on a
47
50
# tier 1 target. All tier 1 targets are currently supported.
Original file line number Diff line number Diff line change @@ -27,4 +27,5 @@ assertions = false
27
27
# Enable warnings during the LLVM compilation (when LLVM is changed, causing a compilation)
28
28
enable-warnings = true
29
29
# Will download LLVM from CI if available on your platform.
30
- download-ci-llvm = " if-unchanged"
30
+ # If you intend to modify `src/llvm-project`, use `download-ci-llvm = "if-unchanged"` or `download-ci-llvm = false` instead.
31
+ download-ci-llvm = true
Original file line number Diff line number Diff line change @@ -2760,7 +2760,8 @@ impl Config {
2760
2760
) ;
2761
2761
}
2762
2762
2763
- b
2763
+ // If download-ci-llvm=true we also want to check that CI llvm is available
2764
+ b && llvm:: is_ci_llvm_available ( self , asserts)
2764
2765
}
2765
2766
Some ( StringOrBool :: String ( s) ) if s == "if-unchanged" => if_unchanged ( ) ,
2766
2767
Some ( StringOrBool :: String ( other) ) => {
Original file line number Diff line number Diff line change @@ -230,4 +230,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
230
230
severity : ChangeSeverity :: Warning ,
231
231
summary : "./x test --rustc-args was renamed to --compiletest-rustc-args as it only applies there. ./x miri --rustc-args was also removed." ,
232
232
} ,
233
+ ChangeInfo {
234
+ change_id : 129473 ,
235
+ severity : ChangeSeverity :: Warning ,
236
+ summary : "`download-ci-llvm = true` now checks if CI llvm is available and has become the default for the compiler profile" ,
237
+ } ,
233
238
] ;
You can’t perform that action at this time.
0 commit comments