Skip to content

Use the platform of a stub binary when looking up compatible architectures #905

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 1 commit into from
Nov 13, 2025
Merged

Use the platform of a stub binary when looking up compatible architectures #905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions Sources/SWBTaskConstruction/TaskProducers/TaskProducer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,11 @@ public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution

public func availableMatchingArchitecturesInStubBinary(at stubBinary: Path, requestedArchs: [String]) async -> [String] {
let stubArchs: Set<String>
let stubPlatforms: [any PlatformInfoProvider]
do {
stubArchs = try globalProductPlan.planRequest.buildRequestContext.getCachedMachOInfo(at: stubBinary).architectures
let stubInfo = try globalProductPlan.planRequest.buildRequestContext.getCachedMachOInfo(at: stubBinary)
stubArchs = stubInfo.architectures
stubPlatforms = stubInfo.platforms.compactMap { lookupPlatformInfo(platform: $0) }
} catch {
delegate.error("unable to create tasks to copy stub binary: can't determine architectures of binary: \(stubBinary.str): \(error)")
return []
Expand All @@ -821,12 +824,13 @@ public class TaskProducerContext: StaleFileRemovalContext, BuildFileResolution
if stubArchs.contains(arch) {
archsToExtract.insert(arch)
} else {
let specLookupContext = SpecLookupCtxt(specRegistry: workspaceContext.core.specRegistry, platform: settings.platform)
let compatibilityArchs = (specLookupContext.getSpec(arch) as? ArchitectureSpec)?.compatibilityArchs
if let compatibleArch = compatibilityArchs?.first(where: { stubArchs.contains($0) }) {
let compatibilityArchs: [String] = stubPlatforms.flatMap { platform in
(workspaceContext.core.specRegistry.getSpec(arch, domain: platform.name) as? ArchitectureSpec)?.compatibilityArchs ?? []
}
if let compatibleArch = compatibilityArchs.first(where: { stubArchs.contains($0) }) {
archsToExtract.insert(compatibleArch)
} else {
delegate.warning("stub binary at '\(stubBinary.str)' does not contain a slice for '\(arch)' or a compatible architecture")
delegate.warning("stub binary at '\(stubBinary.str)' does not contain a slice for '\(arch)' or a compatible architecture. Stub architectures: \(stubArchs.joined(separator: ", ")). Compatibility architectures for \(arch): \(compatibilityArchs.joined(separator: ", "))")
}
}
}
Expand Down
Loading