build: support having more than one ICU in use #3205
Merged
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
|
Thank you! I haven't looked at the patch itself yet, but: @swift-ci Please test |
|
This is an awesome change, thank you! The Android build also continues to work with these changes. |
| @@ -24,6 +22,7 @@ add_swift_library(swiftStdlibStubs OBJECT_LIBRARY TARGET_LIBRARY | |||
| UnicodeExtendedGraphemeClusters.cpp.gyb | |||
| ${swift_stubs_objc_sources} | |||
| ${swift_stubs_unicode_normalization_sources} | |||
| TARGET_SDKS ${SWIFT_SDKS} | |||
There was a problem hiding this comment.
Pretty sure that this hunk is bogus. It is already a TARGET_LIBRARY, so I dont see why this needs TARGET_SDKS as well. Thoughts @gribozavr?
This allows us to cross-compile the standard library to foreign targets on a single host. The ICU dependencies can be specified on the command line on a per-target basis. If one is not specified, we fall back to the default search path and use that for the other targets. Special thanks to Dimitri Gribenko for the various hints in getting this wired up.
|
@swift-ci Please test |
|
ping @gribozavr ... the failure seems unrelated, its in the SDK overlay for HomeKit on watchOS. |
|
@swift-ci Please test OS X platform |
|
Thank you! LGTM as long as CI passes. |
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.
What's in this pull request?
Resolved bug number: (SR-)
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.
This allows us to cross-compile the standard library to foreign targets on a
single host. The ICU dependencies can be specified on the command line on a
per-target basis. If one is not specified, we fall back to the default search
path and use that for the other targets.
Special thanks to Dimitri Gribenko for the various hints in getting this wired
up.