diff options
| author | Greg Fitzgerald <gregf@codeaurora.org> | 2014-06-02 23:11:24 +0000 |
|---|---|---|
| committer | Greg Fitzgerald <gregf@codeaurora.org> | 2014-06-02 23:11:24 +0000 |
| commit | a34de339a57f33fe73aa27ab3e897ccc2c6385d8 (patch) | |
| tree | df9402a495bb376b2582d7c15bfab206035cd532 /CMakeLists.txt | |
| parent | 5e5ddf7eff7a0fa554b1ed323cfee08b23f41817 (diff) | |
Cleanup Android build and provide better diagnostics
No longer need to set ANDROID if COMPILER_RT_TEST_TARGET_TRIPLE is
arm-linux-androideabi.
No need to set ANDROID_COMMON_FLAGS. These flags are already in
CMAKE_CXX_FLAGS which are used in try_compile().
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@210053 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 337e871b8..5bede24d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,12 @@ set(COMPILER_RT_TEST_TARGET_TRIPLE ${TARGET_TRIPLE} CACHE STRING "Default triple for cross-compiled executables") string(REPLACE "-" ";" TARGET_TRIPLE_LIST ${COMPILER_RT_TEST_TARGET_TRIPLE}) list(GET TARGET_TRIPLE_LIST 0 COMPILER_RT_TEST_TARGET_ARCH) +list(GET TARGET_TRIPLE_LIST 1 COMPILER_RT_TEST_TARGET_OS) +list(GET TARGET_TRIPLE_LIST 2 COMPILER_RT_TEST_TARGET_ABI) + +if ("${COMPILER_RT_TEST_TARGET_ABI}" STREQUAL "androideabi") + set(ANDROID 1) +endif() string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) set(COMPILER_RT_LIBRARY_OUTPUT_DIR @@ -199,29 +205,32 @@ macro(test_target_arch arch) set(TARGET_${arch}_CFLAGS ${ARGN}) try_compile(CAN_TARGET_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE} COMPILE_DEFINITIONS "${TARGET_${arch}_CFLAGS}" + OUTPUT_VARIABLE TARGET_${arch}_OUTPUT CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${TARGET_${arch}_CFLAGS}") if(${CAN_TARGET_${arch}}) list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch}) + elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "${arch}" OR + "${arch}" STREQUAL "arm_android") + # Bail out if we cannot target the architecture we plan to test. + message(FATAL_ERROR "Cannot compile for ${arch}:\n${TARGET_${arch}_OUTPUT}") endif() endmacro() -if(ANDROID_COMMON_FLAGS) - test_target_arch(arm_android "${ANDROID_COMMON_FLAGS}") -else() - if("${LLVM_NATIVE_ARCH}" STREQUAL "X86") - if (NOT MSVC) - test_target_arch(x86_64 ${TARGET_64_BIT_CFLAGS}) - endif() - test_target_arch(i386 ${TARGET_32_BIT_CFLAGS}) - elseif("${LLVM_NATIVE_ARCH}" STREQUAL "PowerPC") - test_target_arch(powerpc64 ${TARGET_64_BIT_CFLAGS}) +if("${LLVM_NATIVE_ARCH}" STREQUAL "X86") + if (NOT MSVC) + test_target_arch(x86_64 ${TARGET_64_BIT_CFLAGS}) endif() + test_target_arch(i386 ${TARGET_32_BIT_CFLAGS}) +elseif("${LLVM_NATIVE_ARCH}" STREQUAL "PowerPC") + test_target_arch(powerpc64 ${TARGET_64_BIT_CFLAGS}) +endif() - # Build ARM libraries if we are configured to test on ARM - if("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm|aarch64") - test_target_arch(arm "-march=armv7-a") - test_target_arch(aarch64 "-march=armv8-a") - endif() +# Build ARM libraries if we are configured to test on ARM +if(ANDROID) + test_target_arch(arm_android "") +elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm|aarch64") + test_target_arch(arm "-march=armv7-a") + test_target_arch(aarch64 "-march=armv8-a") endif() # We support running instrumented tests when we're not cross compiling |