Skip to content

repair static builds of Foundation #1787

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 2 commits into from
Nov 28, 2018
Merged

Conversation

compnerd
Copy link
Member

No description provided.

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

CC: @kevints

Correct the library name specification for the ICU components.  We would get
away with this as there can be unresolved symbols in a shared link.

Link in the implicit dependencies pulled in through Foundation via
CoreFoundation.  When statically linking, we would no longer link against
CoreFoundation.
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

Actually, thinking about this, we can commit this, it won't break anything, but will allow static builds to work. The issue with build-script can be addressed with this committed.

@compnerd compnerd merged commit 78e4752 into swiftlang:master Nov 28, 2018
@compnerd compnerd deleted the static branch November 28, 2018 17:52
@spevans
Copy link
Contributor

spevans commented Nov 28, 2018

@compnerd Should we be building plutil as part of the static lib build? Seems unnecessary to be building it twice

@@ -250,7 +248,7 @@ add_swift_library(Foundation
-L${install_dir}/usr/lib
-lCoreFoundation
${CURL_LIBRARIES}
${ICU_UC_LIBRARIES} ${ICU_I18N_LIBRARIES}
${ICU_UC_LIBRARY} ${ICU_I18N_LIBRARY}
${LIBXML2_LIBRARIES}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@compnerd This change seems to have broken it and also in the set(Foundation_INTERFACE_LIBRARIES below.

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.

2 participants