Install swiftmodules with full module triple #470
Merged
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
CMP0091 was added in CMake 3.15. The minimum version is CMake 3.16 so we don't need to do the check anymore.
Install swiftmodules with the full module triple expected by the compiler instead of attempting to compute the correct architecture name in CMake.
|
@swift-ci please test |
compnerd
approved these changes
May 13, 2025
lorentey
approved these changes
May 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This cleans up how the CMake build of Swift-Collections installs swiftmodules to use the swift module triple expected by the compiler for a given target triple instead of trying to recreate the correct architecture name in CMake. The existing computation is incorrect for modules building for x86_64 FreeBSD machines, causing swift-foundation to fail to build. Letting the compiler specify what it expects the module triple to be for a given target triple will be more robust.
resolves: swiftlang/swift-foundation#1230