Skip to content

Commit 13522e7

Browse files
committed
Make download-ci-llvm = true check if CI llvm is available
and make it the default for the compiler profile, as to prevent unnecessarily checking out `src/llvm-project` with `"if-unchanged"`.
1 parent eb33b43 commit 13522e7

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

Diff for: config.example.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
# Unless you're developing for a target where Rust CI doesn't build a compiler
4343
# toolchain or changing LLVM locally, you probably want to leave this enabled.
4444
#
45+
# Set this to `true` to download if CI llvm available otherwise it builds
46+
# from `src/llvm-project`.
47+
#
4548
# Set this to `"if-unchanged"` to download only if the llvm-project has not
4649
# been modified. You can also use this if you are unsure whether you're on a
4750
# tier 1 target. All tier 1 targets are currently supported.
@@ -233,7 +236,7 @@
233236
# Instead of downloading the src/stage0 version of cargo-clippy specified,
234237
# use this cargo-clippy binary instead as the stage0 snapshot cargo-clippy.
235238
#
236-
# Note that this option should be used with the same toolchain as the `rustc` option above.
239+
# Note that this option should be used with the same toolchain as the `rustc` option above.
237240
# Otherwise, clippy is likely to fail due to a toolchain conflict.
238241
#cargo-clippy = "/path/to/cargo-clippy"
239242

Diff for: src/bootstrap/defaults/config.compiler.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ assertions = false
2727
# Enable warnings during the LLVM compilation (when LLVM is changed, causing a compilation)
2828
enable-warnings = true
2929
# 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 `"if-unchanged"` or `false` instead.
31+
download-ci-llvm = true

Diff for: src/bootstrap/src/core/config/config.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2773,7 +2773,8 @@ impl Config {
27732773
);
27742774
}
27752775

2776-
b
2776+
// If download-ci-llvm=true we also want to check that CI llvm is available
2777+
b && llvm::is_ci_llvm_available(self, asserts)
27772778
}
27782779
Some(StringOrBool::String(s)) if s == "if-unchanged" => if_unchanged(),
27792780
Some(StringOrBool::String(other)) => {

Diff for: src/bootstrap/src/utils/change_tracker.rs

+5
Original file line numberDiff line numberDiff line change
@@ -245,4 +245,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[
245245
severity: ChangeSeverity::Warning,
246246
summary: "Removed `rust.split-debuginfo` as it was deprecated long time ago.",
247247
},
248+
ChangeInfo {
249+
change_id: 129473,
250+
severity: ChangeSeverity::Warning,
251+
summary: "`download-ci-llvm = true` now checks if CI llvm is available and has become the default for the compiler profile",
252+
},
248253
];

0 commit comments

Comments
 (0)