[android] Avoid linking twice with C++ #21087
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
The Android targetted libraries already link (manually) with the Android NDK C++ libraries. When using Clang and lld, an extra link to libc++ is requested, which will fail because Android names it libc++_shared.so instead. To avoid looking for the wrong name, and since the library is referenced manually either way, request no linking with the standard C++ libraries (but add the math library in, which is implicitly linked when C++ is linked, and it is needed for Glibc at least).
|
@apple/swift5-branch-managers this is a low risk fix, it only impacts the build for the android standard library and corrects it so that we do not accidentally link against two different C++ runtimes which can have undesired consequences. |
|
CC: @tkremenek - seems that I can't actually tag the branch managers :-( |
|
@swift-ci please test |
tkremenek
approved these changes
Dec 7, 2018
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.
The Android targetted libraries already link (manually) with the Android
NDK C++ libraries. When using Clang and lld, an extra link to libc++ is
requested, which will fail because Android names it libc++_shared.so
instead. To avoid looking for the wrong name, and since the library is
referenced manually either way, request no linking with the standard C++
libraries (but add the math library in, which is implicitly linked when
C++ is linked, and it is needed for Glibc at least).
Backport of #21086.