Skip to content

build: use the target variables for the ICU check #19418

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
Sep 20, 2018

Conversation

compnerd
Copy link
Member

The ICU library is used for the target library, not the host tools. Use the
appropriate variable SWIFT_PRIMARY_VARIANT_SDK and
SWIFT_PRIMARY_VARIANT_ARCH to select the right CMake variables for the ICU
definitions. There is no need to use the _default suffixed versions as the
defaults have already been used to set the value above.

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: @milseman @gottesmm @jrose-apple

@compnerd
Copy link
Member Author

@swift-ci please test

The ICU library is used for the target library, not the host tools.  Use the
appropriate variable `SWIFT_PRIMARY_VARIANT_SDK` and
`SWIFT_PRIMARY_VARIANT_ARCH` to select the right CMake variables for the ICU
definitions.  There is no need to use the `_default` suffixed versions as the
defaults have already been used to set the value above.
@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 9fa5b6505dc03a07f82c7d55b9c5d5f68b80c7ca

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 9fa5b6505dc03a07f82c7d55b9c5d5f68b80c7ca

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 9fa5b6505dc03a07f82c7d55b9c5d5f68b80c7ca

@compnerd compnerd merged commit 13468cf into swiftlang:master Sep 20, 2018
@compnerd compnerd deleted the icu-vars branch September 20, 2018 22:37
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