Skip to content

Merge release/6.2 into main #823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 3, 2025
Merged

Merge release/6.2 into main #823

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9626780
[test] NFC: Factor out `withHostToolsPackages`
hamishknight Jul 25, 2025
13e2888
[test] Parameterize two host tools index tests
hamishknight Jul 25, 2025
40c80f4
[test] Set `SDKROOT: auto` at project level for `withHostToolsPackages`
hamishknight Jul 25, 2025
ba15d0c
[test] Add same-package host tool dependency to `withHostToolsPackages`
hamishknight Jul 25, 2025
7939954
Only check `isTargetSuitableForPlatformForIndex` for workspace descri…
hamishknight Jul 25, 2025
6964828
Remove dependency check from `isTargetSuitableForPlatformForIndex`
hamishknight Jul 25, 2025
3144d7b
Merge pull request #803 from hamishknight/desc-golf-6.2
hamishknight Sep 18, 2025
b9a2730
Merge branch 'main' into automerge/merge-main-2025-09-29_09-02
owenv Sep 30, 2025
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
2 changes: 1 addition & 1 deletion Sources/SWBCore/LinkageDependencyResolver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ actor LinkageDependencyResolver {
return nil
}
let buildParameters = resolver.buildParametersByTarget[target] ?? configuredTarget.parameters
if !resolver.isTargetSuitableForPlatformForIndex(target, parameters: buildParameters, imposedParameters: imposedParameters) {
if await !resolver.isTargetSuitableForPlatformForIndex(target, parameters: buildParameters, imposedParameters: imposedParameters) {
return nil
}
let effectiveImposedParameters = imposedParameters?.effectiveParameters(target: configuredTarget, dependency: ConfiguredTarget(parameters: buildParameters, target: target), dependencyResolver: resolver)
Expand Down
Loading