Skip to content

Commit 2f1d61a

Browse files
authored
Rollup merge of #145149 - Shourya742:2025-07-08-convert-config-method-invoke-inside-parse-functions, r=Kobzol
Make config method invoke inside parse use dwn_ctx This PR is part of a series of config refactorings. It removes calls from config methods to solid functions defined in `config.rs`. After this, we will remove the default dependencies in the config. r? ```@Kobzol```
2 parents 907076c + bfa6b56 commit 2f1d61a

File tree

3 files changed

+439
-306
lines changed

3 files changed

+439
-306
lines changed

src/bootstrap/src/core/build_steps/llvm.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,10 @@ pub(crate) fn detect_llvm_freshness(config: &Config, is_git: bool) -> PathFreshn
196196
///
197197
/// This checks the build triple platform to confirm we're usable at all, and if LLVM
198198
/// with/without assertions is available.
199-
pub(crate) fn is_ci_llvm_available_for_target(config: &Config, asserts: bool) -> bool {
199+
pub(crate) fn is_ci_llvm_available_for_target(
200+
host_target: &TargetSelection,
201+
asserts: bool,
202+
) -> bool {
200203
// This is currently all tier 1 targets and tier 2 targets with host tools
201204
// (since others may not have CI artifacts)
202205
// https://doc.rust-lang.org/rustc/platform-support.html#tier-1
@@ -235,8 +238,8 @@ pub(crate) fn is_ci_llvm_available_for_target(config: &Config, asserts: bool) ->
235238
("x86_64-unknown-netbsd", false),
236239
];
237240

238-
if !supported_platforms.contains(&(&*config.host_target.triple, asserts))
239-
&& (asserts || !supported_platforms.contains(&(&*config.host_target.triple, true)))
241+
if !supported_platforms.contains(&(&*host_target.triple, asserts))
242+
&& (asserts || !supported_platforms.contains(&(&*host_target.triple, true)))
240243
{
241244
return false;
242245
}

0 commit comments

Comments
 (0)