Non-Darwin SDKs product results in per-arch directories. #1710
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
|
I will trigger testing on this as needed when the main patch has been vetted. |
|
I think that we should split this up into two changes. The CMake changes can go in first since they aren't in use just yet. |
|
The CMake is probably not use by “anyone” at the moment. The script is the real thing, sadly. Splitting it is not a problem, the CMake changes should not affect the build at all. |
Depends on swiftlang/swift#19432 Unix (other than Darwin) and Windows do not support fat binaries. However, the build system was placing the build results in the platform/OS folder, instead of the per-architecture folder. Having two architectures side by side was impossible. After applying the above patch in the Swift compiler, non-Darwin platforms will look into the per-architecture folders, so the sibling projects need to leave the products in the right place.
drodriguez
force-pushed
the
thin-platforms
branch
from
dbc0544 to
1db534b
Compare
|
I left in this PR the changes in the script. I will create another PR with the CMake changes. We know (because Jenkins passed in the dependent PR) that this changes work and should be enough for most people. |
|
@swift-ci please test linux |
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.
Depends on swiftlang/swift#19432
Unix (other than Darwin) and Windows do not support fat binaries.
However, the build system was placing the build results in the
platform/OS folder, instead of the per-architecture folder. Having two
architectures side by side was impossible.
After applying the above patch in the Swift compiler, non-Darwin
platforms will look into the per-architecture folders, so the sibling
projects need to leave the products in the right place.
The change is performed in the CMakeList.txt file (which as far as I
understand is not used to build Foundation at the moment), and the
Python script.