Correctly specify platform_version when prelinking zippered binaries #971
+161
−6
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
owenv
requested review from
aciidgh,
jakepetroules,
mhrawdon and
neonichu
as code owners
Collaborator
Author
|
@swift-ci test |
jakepetroules
requested changes
Dec 10, 2025
| let sdkVersion: Version? | ||
| if cbc.scope.evaluate(BuiltinMacros.IS_ZIPPERED) && buildPlatform == .macCatalyst { | ||
| if let baseSDKVersion = cbc.producer.sdk?.version { | ||
| sdkVersion = cbc.producer.sdk?.versionMap["macOS_iOSMac"]?[baseSDKVersion] |
Collaborator
There was a problem hiding this comment.
It should be an error if we fail to find the mapped value, if Apple has released an SDK with a missing Mac Catalyst mapping value, something is extremely wrong.
| let minDeploymentTarget = cbc.scope.evaluate(deploymentTargetMacro).nilIfEmpty, | ||
| let sdkVersion = cbc.producer.sdk?.version { | ||
| commandLine += ["-platform_version", "\(buildPlatform.rawValue)", minDeploymentTarget, sdkVersion.canonicalDeploymentTargetForm.description] | ||
| for buildPlatform in cbc.producer.targetBuildVersionPlatforms(in: cbc.scope)?.sorted() ?? [] { |
Collaborator
There was a problem hiding this comment.
I'd add an if let sdk = cbc.producer.sdk outside the for loop, since there's no point descending into this loop if we don't have one. Then there's no awkward nullability with the SDK version down lower.
owenv
force-pushed
the
owenv/zipperplatformversion
branch
from
7403262 to
428855d
Compare
Collaborator
Author
|
@swift-ci test |
jakepetroules
approved these changes
Dec 11, 2025
| let version: Version | ||
| if cbc.scope.evaluate(BuiltinMacros.IS_ZIPPERED) && buildPlatform == .macCatalyst { | ||
| guard let correspondingVersion = sdk.versionMap["macOS_iOSMac"]?[sdkVersion] else { | ||
| delegate.error("'\(sdk.canonicalName)' us missing a Mac Catalyst version mapping for '\(sdkVersion)'") |
Collaborator
There was a problem hiding this comment.
typo: s/us/is/
Suggested change
| delegate.error("'\(sdk.canonicalName)' us missing a Mac Catalyst version mapping for '\(sdkVersion)'") | |
| delegate.error("'\(sdk.canonicalName)' is missing a Mac Catalyst version mapping for '\(sdkVersion)'") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When zippering we need to include -platform_version for both macOS and Mac Catalyst, instead of only one or the other.