This repository was archived by the owner on Feb 27, 2018. It is now read-only.
Merge 'mbp' branch and my own changes to fix CMake 3.6 #1
+108
−51
Conversation
This file contains 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
(Modified by Andrew Gunnerson)
CMake 3.6 has issues with these operations
libc++.{a,so} are not really libraries in r12. They are scripts that
pull in other libraries, such as libunwind, libatomic, and
libandroid_support. The toolchain file was trying to link directly to
c++_{static.a,shared.so}, which no longer works due to symbols having
moved to other libraries (eg. libandroid_support).
This commit fixes the path to the library on r12 and adds the library
path to the list of link paths.
Some minor fixes for NDK r12.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.