diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-02 19:10:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-12 14:40:54 (GMT) |
| commit | d1e3cec2aa17a2f07f22c64c3bd29c765d69d9d2 (patch) | |
| tree | 833d16f522064831d472ba0d6753bb14c5c4e024 /Modules/Platform/Android-Clang.cmake | |
| parent | 504db72d99fc2302de605fd9c2f845c1b8865500 (diff) | |
| download | CMake-d1e3cec2aa17a2f07f22c64c3bd29c765d69d9d2.zip CMake-d1e3cec2aa17a2f07f22c64c3bd29c765d69d9d2.tar.gz CMake-d1e3cec2aa17a2f07f22c64c3bd29c765d69d9d2.tar.bz2 | |
Android: Add Clang -target option for current ABI
Diffstat (limited to 'Modules/Platform/Android-Clang.cmake')
| -rw-r--r-- | Modules/Platform/Android-Clang.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake index b33f376..7ed5046 100644 --- a/Modules/Platform/Android-Clang.cmake +++ b/Modules/Platform/Android-Clang.cmake @@ -36,8 +36,17 @@ endif() include(Platform/Android-Common) +# The NDK toolchain configuration files at: +# +# <ndk>/[build/core/]toolchains/*-clang*/setup.mk +# +# contain logic to set LLVM_TRIPLE for Clang-based toolchains for each target. +# We need to produce the same target here to produce compatible binaries. include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-Clang) macro(__android_compiler_clang lang) __android_compiler_common(${lang}) + if(NOT CMAKE_${lang}_COMPILER_TARGET) + set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}") + endif() endmacro() |