Skip to content

Non-Darwin SDKs product results in per-arch directories. #392

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

Closed
wants to merge 1 commit into from

Conversation

drodriguez
Copy link
Contributor

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.

@compnerd
Copy link
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.

@drodriguez
Copy link
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.

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.
@ktopley-apple
Copy link
Contributor

@swift-ci please test

@drodriguez drodriguez closed this Oct 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants