Revert the bootstrap changes to copy the SwiftPM-built universal PackageDescription and PackagePlugin libraries #3540
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
…ageDescription and PackagePlugin libraries This goes back to copying the CMake-built libraries instead of the SwiftPM-built ones. This means that they will be thin on macOS, built only for the architecture of the host on which they were built. This is temporary until the Xcode that is used on the builders is new enough to have the XCBuild support needed for emitting Swift module interfaces.
|
@swift-ci please test |
|
@swift please smoke test |
tomerd
approved these changes
Jun 9, 2021
abertelrud
added
the
ready
|
@swift-ci please build toolchain |
|
@swift-ci please smoke test |
|
The self-hosted macOS test failure looks unrelated: |
|
@swift-ci self test macOS platform |
|
@swift-ci hosted test macOS platform |
|
@swift-ci Please smoke test macOS platform |
1 similar comment
|
@swift-ci Please smoke test macOS platform |
This was referenced Jun 11, 2021
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 reverts the bootstrap changes and goes back to copying the CMake-built libraries instead of the SwiftPM-built ones. This means that they will be thin on macOS, built only for the architecture of the host on which they were built. This is temporary until the Xcode that is used on the builders is new enough to have the XCBuild support needed for emitting Swift module interfaces.
Motivation:
This caused toolchain build failures.
Modifications:
Revert the part of bootstrap that copies the PackageDescription and PackagePlugin so they again come from CMake. It does not do a wholesale revert of unrelated changes, since other diffs have stacked on them.
Result:
PackageDescription and PackagePlugin will again be built thin on macOS, since they will come from the CMake bootstrap build, as before. But they will have the .swiftinterface files no matter how old the Xcode is that is building the toolchain.