Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/bootstrap/src/core/config/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2495,6 +2495,7 @@ pub fn parse_download_ci_llvm<'a>(
asserts: bool,
) -> bool {
let dwn_ctx = dwn_ctx.as_ref();
let is_explicit = download_ci_llvm.is_some();
let download_ci_llvm = download_ci_llvm.unwrap_or(StringOrBool::Bool(true));

let if_unchanged = || {
Expand Down Expand Up @@ -2539,8 +2540,18 @@ pub fn parse_download_ci_llvm<'a>(
);
}

// If download-ci-llvm=true we also want to check that CI llvm is available
b && llvm::is_ci_llvm_available_for_target(&dwn_ctx.host_target, asserts)
let available = llvm::is_ci_llvm_available_for_target(&dwn_ctx.host_target, asserts);
if b && !available && is_explicit {
println!(
"WARNING: `llvm.download-ci-llvm = true` was specified, but CI LLVM \
(assertions={asserts}) is unavailable for target triple `{}`.",
dwn_ctx.host_target.triple
);
println!(
"HELP: `download-ci-llvm` will be disabled and LLVM will be built from source."
);
}
b && available
}
StringOrBool::String(s) if s == "if-unchanged" => if_unchanged(),
StringOrBool::String(other) => {
Expand Down
9 changes: 9 additions & 0 deletions src/bootstrap/src/core/config/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@ fn download_ci_llvm() {
}
}

use crate::core::download::is_download_ci_available;

#[test]
fn download_ci_llvm_unsupported_assertions() {
assert!(!is_download_ci_available("i686-pc-windows-msvc", true));
assert!(is_download_ci_available("x86_64-pc-windows-msvc", true));
assert!(!is_download_ci_available("aarch64-apple-darwin", true));
}

#[test]
fn clap_verify() {
Flags::command().debug_assert();
Expand Down
Loading