kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android: Add Clang -target option for current ABI

This commit is contained in:
Brad King 2016-06-02 15:10:05 -04:00
parent 504db72d99
commit d1e3cec2aa
9 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Platform/Android-Clang.cmake
View File

@ -36,8 +36,17 @@ endif()
include(Platform/Android-Common) 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) include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-Clang)
macro(__android_compiler_clang lang) macro(__android_compiler_clang lang)
__android_compiler_common(${lang}) __android_compiler_common(${lang})
if(NOT CMAKE_${lang}_COMPILER_TARGET)
set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}")
endif()
endmacro() endmacro()

1
Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
View File

@ -1,2 +1,3 @@
# <ndk>/build/core/toolchains/aarch64-linux-android-clang/setup.mk # <ndk>/build/core/toolchains/aarch64-linux-android-clang/setup.mk
set(_ANDROID_ABI_CLANG_TARGET "aarch64-none-linux-android")
include(Platform/Android/abi-common-Clang) include(Platform/Android/abi-common-Clang)

1
Modules/Platform/Android/abi-armeabi-Clang.cmake
View File

@ -1,2 +1,3 @@
# <ndk>/build/core/toolchains/arm-linux-androideabi-clang/setup.mk # <ndk>/build/core/toolchains/arm-linux-androideabi-clang/setup.mk
set(_ANDROID_ABI_CLANG_TARGET "armv5te-none-linux-androideabi")
include(Platform/Android/abi-common-Clang) include(Platform/Android/abi-common-Clang)

1
Modules/Platform/Android/abi-armeabi-v6-Clang.cmake
View File

@ -1,2 +1,3 @@
# <ndk>/build/core/toolchains/arm-linux-androideabi-clang/setup.mk # <ndk>/build/core/toolchains/arm-linux-androideabi-clang/setup.mk
set(_ANDROID_ABI_CLANG_TARGET "armv6-none-linux-androideabi")
include(Platform/Android/abi-common-Clang) include(Platform/Android/abi-common-Clang)

1
Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake
View File

@ -1,2 +1,3 @@
# <ndk>/build/core/toolchains/arm-linux-androideabi-clang/setup.mk # <ndk>/build/core/toolchains/arm-linux-androideabi-clang/setup.mk
set(_ANDROID_ABI_CLANG_TARGET "armv7-none-linux-androideabi")
include(Platform/Android/abi-common-Clang) include(Platform/Android/abi-common-Clang)

1
Modules/Platform/Android/abi-mips-Clang.cmake
View File

@ -1,2 +1,3 @@
# <ndk>/build/core/toolchains/mipsel-linux-android-clang/setup.mk # <ndk>/build/core/toolchains/mipsel-linux-android-clang/setup.mk
set(_ANDROID_ABI_CLANG_TARGET "mipsel-none-linux-android")
include(Platform/Android/abi-common-Clang) include(Platform/Android/abi-common-Clang)

1
Modules/Platform/Android/abi-mips64-Clang.cmake
View File

@ -1,2 +1,3 @@
# <ndk>/build/core/toolchains/mips64el-linux-android-clang/setup.mk # <ndk>/build/core/toolchains/mips64el-linux-android-clang/setup.mk
set(_ANDROID_ABI_CLANG_TARGET "mips64el-none-linux-android")
include(Platform/Android/abi-common-Clang) include(Platform/Android/abi-common-Clang)

1
Modules/Platform/Android/abi-x86-Clang.cmake
View File

@ -1,2 +1,3 @@
# <ndk>/build/core/toolchains/x86-clang/setup.mk # <ndk>/build/core/toolchains/x86-clang/setup.mk
set(_ANDROID_ABI_CLANG_TARGET "i686-none-linux-android")
include(Platform/Android/abi-common-Clang) include(Platform/Android/abi-common-Clang)

1
Modules/Platform/Android/abi-x86_64-Clang.cmake
View File

@ -1,2 +1,3 @@
# <ndk>/build/core/toolchains/x86_64-clang/setup.mk # <ndk>/build/core/toolchains/x86_64-clang/setup.mk
set(_ANDROID_ABI_CLANG_TARGET "x86_64-none-linux-android")
include(Platform/Android/abi-common-Clang) include(Platform/Android/abi-common-Clang)