diff options
| author | Haibo Huang <hhb@google.com> | 2020-10-28 12:15:10 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2020-11-05 19:45:09 -0800 |
| commit | 85e5139abac3c3fc1aba2d796a4020e0a6e95115 (patch) | |
| tree | 72040ae7ed9dbfc82d58ee363c7e4453b363061e /Modules/Platform/Android-Clang.cmake | |
| parent | 622ac065d2abeb53de3548b7e4f3d9b5980dfa8d (diff) | |
| download | cmake-85e5139abac3c3fc1aba2d796a4020e0a6e95115.tar.gz | |
Android: Move *_LLVM_TRIPLE to the centralized table
This allows us to skip `abi-*.cmake` in the next change.
In the future we may move all this information to the NDK.
Diffstat (limited to 'Modules/Platform/Android-Clang.cmake')
| -rw-r--r-- | Modules/Platform/Android-Clang.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake index 44d48cd861..5c1fe87813 100644 --- a/Modules/Platform/Android-Clang.cmake +++ b/Modules/Platform/Android-Clang.cmake @@ -53,7 +53,7 @@ macro(__android_compiler_clang lang) __android_compiler_common(${lang}) endif() if(NOT CMAKE_${lang}_COMPILER_TARGET) - set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}") + set(CMAKE_${lang}_COMPILER_TARGET "${CMAKE_ANDROID_ARCH_LLVM_TRIPLE}") if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED) string(APPEND CMAKE_${lang}_COMPILER_TARGET "${CMAKE_SYSTEM_VERSION}") endif() |