Non-Darwin SDKs product results in per-arch directories.#392
Closed
drodriguez wants to merge 1 commit intoswiftlang:masterfrom
Closed
Non-Darwin SDKs product results in per-arch directories.#392drodriguez wants to merge 1 commit intoswiftlang:masterfrom
drodriguez wants to merge 1 commit intoswiftlang:masterfrom
Conversation
Member
|
@drodriguez can we stage the installation so that we put a copy as a workaround in the old location as well so that we can merge this without the rest of the changes? Having fewer dependent changes makes things easier. |
Contributor
Author
|
I suppose that it might work. We can only put one architecture in the old location, though, but Jenkins only builds one architecture, so it should work. |
b9e1f98 to
802dac7
Compare
802dac7 to
6432e4e
Compare
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.
6432e4e to
fa999f3
Compare
Contributor
|
@swift-ci please test |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
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.