diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-03-17 10:59:57 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-03-19 14:31:30 +0100 |
| commit | df3a15512bd0f5ddd9f0dd74f0a058ee55b33904 (patch) | |
| tree | ee025ba3683d313cbb4e58d2d09dc1787725a0cb /NOTES.ANDROID | |
| parent | f39276fdff6ccc1c71bdb30a8050fa1c0bf6e20a (diff) | |
Configurations/15-android.conf: detect clang by PATH, not by CC.
Since they intend to omit gcc, it's more appropriate to simply detect
if there is NDK's clang on PATH, as opposite to requiring to specify it
with CC=clang (and looking for it on PATH).
Also detect NDK version and default to armv7-a for NDK>16.
Address failure to recognize -D__ADNDROID_API__=N in CPPFLAGS.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5613)
Diffstat (limited to 'NOTES.ANDROID')
| -rw-r--r-- | NOTES.ANDROID | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/NOTES.ANDROID b/NOTES.ANDROID index f6c28d28ad..dcddc4cf77 100644 --- a/NOTES.ANDROID +++ b/NOTES.ANDROID @@ -43,10 +43,11 @@ conflict, and mixing the two is therefore not supported. Migration to CROSS_SYSROOT-less setup is recommended. - One can engage clang by passing CC=clang to Configure. In such case - PATH needs even more adjustments to cover NDK's clang itself, as well - as unprefixed, yet target-specific, ar and ranlib (or not, if you use - binutils-multiarch on your Linux). + One can engage clang by adjusting PATH to cover NDK's clang. Just keep + in mind that if you miss it, Configure will try to use gcc... Also, + PATH would need even further adjustment to cover unprefixed, yet + target-specific, ar and ranlib (or not, if you use binutils-multiarch + on your Linux). Running tests (on Linux) ------------------------ |