diff options
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | compiler-rt/cmake/base-config-ix.cmake | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 000cc0d750b..a0675818f2d 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -105,6 +105,9 @@ if(NOT COMPILER_RT_DEFAULT_TARGET_TRIPLE STREQUAL TARGET_TRIPLE) else() set(COMPILER_RT_HAS_EXPLICIT_DEFAULT_TARGET_TRIPLE FALSE) endif() +if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi") + set(ANDROID 1) +endif() include(CompilerRTUtils) set(COMPILER_RT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake index 0829344df45..b02f35a6e97 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake @@ -61,10 +61,6 @@ else() set(COMPILER_RT_TEST_COMPILER_ID GNU) endif() -if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi") - set(ANDROID 1) -endif() - string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) set(COMPILER_RT_LIBRARY_OUTPUT_DIR ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) @@ -118,7 +114,6 @@ macro(test_targets) if(ANDROID) # Examine compiler output to determine target architecture. detect_target_arch() - set(COMPILER_RT_OS_SUFFIX "-android") elseif(NOT APPLE) # Supported archs for Apple platforms are generated later if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64") if(NOT MSVC) |
