[build] Explicitly pass ICU_DATA_LIBRARY when building foundation #41041
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
|
swiftlang/swift-corelibs-foundation#3133 @swift-ci please build toolchain |
|
@swift-ci please smoke test |
|
Linux Toolchain (Ubuntu 20.04) Install command |
compnerd
approved these changes
Jan 27, 2022
Azoy
added a commit
to Azoy/swift
that referenced
this pull request
Feb 7, 2022
[build] Explicitly pass ICU_DATA_LIBRARY when building foundation
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.
When building Foundation statically, we weren't passing icuucswift or icudataswift as dependencies. Doing so, icuucswift gets it's import location working as intended because we were already passing
ICU_UC_LIBRARYhere in the build-script-impl, but icudataswift was not being passed, so when we were looking at where we import it from the location was the default icu in the system rather than the data library we just built. Explicitly pass the location of the data library to Foundation.Partially resolves: https://bugs.swift.org/browse/SR-15770 relies on swiftlang/swift-corelibs-foundation#3133