Skip to content

Swift Build: pass some additional settings needed for cross-compilation #8697

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.

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
May 25, 2025

Conversation

jakepetroules
Copy link
Contributor

This patch ensures that the Swift Build SDK and platform name are set correctly for embedded Apple platforms (iOS, tvOS, watchOS) and Android, that the SDK variant is set correctly for Mac Catalyst, and that the deployment target version is correctly propagated from the --triple argument specified on the command line.

@jakepetroules
Copy link
Contributor Author

@swift-ci test

@jakepetroules jakepetroules force-pushed the eng/PR-xcompilation-settings branch from b76c9e2 to 5f7cc65 Compare May 20, 2025 06:58
@jakepetroules
Copy link
Contributor Author

@swift-ci test

@jakepetroules
Copy link
Contributor Author

@swift-ci test windows

@@ -562,3 +593,41 @@ fileprivate extension SwiftBuild.SwiftBuildMessage.DiagnosticInfo.Location {
}
}
}

fileprivate extension Triple {
var deploymentTargetSettingName: String? {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing a case for visionOS?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but the entire codebase is missing visionOS cases right now, I'll look at handling that separately.

@jakepetroules jakepetroules force-pushed the eng/PR-xcompilation-settings branch from 5f7cc65 to dcd5f18 Compare May 20, 2025 18:45
@jakepetroules
Copy link
Contributor Author

@swift-ci test

@jakepetroules
Copy link
Contributor Author

@swift-ci test windows

@jakepetroules jakepetroules added cross-compilation build system Changes to interactions with build systems WebAssembly Android labels May 21, 2025
@jakepetroules
Copy link
Contributor Author

@swift-ci test windows self hosted

@jakepetroules
Copy link
Contributor Author

@swift-ci test windows

2 similar comments
@jakepetroules
Copy link
Contributor Author

@swift-ci test windows

@jakepetroules
Copy link
Contributor Author

@swift-ci test windows

@jakepetroules
Copy link
Contributor Author

@swift-ci test self-hosted windows

@jakepetroules
Copy link
Contributor Author

@swift-ci test windows

This patch ensures that the Swift Build SDK and platform name are set correctly for embedded Apple platforms (iOS, tvOS, watchOS) and Android, that the SDK variant is set correctly for Mac Catalyst, and that the deployment target version is correctly propagated from the `--triple` argument specified on the command line.
@jakepetroules jakepetroules force-pushed the eng/PR-xcompilation-settings branch from dcd5f18 to 9b9a4eb Compare May 24, 2025 06:55
@jakepetroules
Copy link
Contributor Author

@swift-ci test

@jakepetroules
Copy link
Contributor Author

@swift-ci test windows

1 similar comment
@jakepetroules
Copy link
Contributor Author

@swift-ci test windows

@jakepetroules jakepetroules merged commit 8ab590c into main May 25, 2025
6 checks passed
@jakepetroules jakepetroules deleted the eng/PR-xcompilation-settings branch May 25, 2025 03:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android build system Changes to interactions with build systems cross-compilation WebAssembly
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants