Skip to content

build: explicitly state arch for ICU #14728

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

Merged
merged 1 commit into from
Feb 28, 2018
Merged

Conversation

compnerd
Copy link
Member

This is needed to support cross-compilation on targets which do not
support FAT binaries (i.e. non-MachO targets). The primary user of this
functionality right now is Windows, but this support is needed for Linux
and android as well.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

@compnerd
Copy link
Member Author

CC: @gottesmm @modocache @gonzalolarralde

@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 47acacb1fc3620e0dc026a22724d08adf1830974

This is needed to support cross-compilation on targets which do not
support FAT binaries (i.e. non-MachO targets).  The primary user of this
functionality right now is Windows, but this support is needed for Linux
and android as well.
@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 47acacb1fc3620e0dc026a22724d08adf1830974

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 47acacb1fc3620e0dc026a22724d08adf1830974

@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

@gottesmm
Copy link
Contributor

@compnerd I don't remember how all of this fits together (I would have to review/page in the code again). @Rostepher any thoughts?

@compnerd
Copy link
Member Author

@gottesmm this basically creates a ton more cached CMake values to specify the ICU libraries for each (os, arch) pair. This enables multiple cross-compiled builds for non-MachO targets which do not have FAT binaries. It effectively changes the naming pattern for the variables.

@compnerd
Copy link
Member Author

@gottesmm what do you think of merging this? This is really needed to get the Windows cross-compilation story fixed up.

@gottesmm
Copy link
Contributor

I see what you did. It looks overall good. Can you double check that you caught all ICU checks?

@compnerd
Copy link
Member Author

@gottesmm pretty sure that I have got all the sites covered here

@gottesmm
Copy link
Contributor

Then led er rip

@compnerd compnerd merged commit 420328b into swiftlang:master Feb 28, 2018
@compnerd compnerd deleted the icu-arch branch February 28, 2018 18:21
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