diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-06-27 22:52:05 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-06-27 22:52:05 +0000 |
| commit | bbe3db0f62c9b971f1a72057ddb4f668c5188b47 (patch) | |
| tree | c530c4065d6f57813c201259a1e3d042c0f834e0 /cmake/base-config-ix.cmake | |
| parent | 5619f196ea7f6325070005846ab2dc9d86baa696 (diff) | |
[CMake] Check for androidabi in CMakeLists.txt not base-config-ix.cmake
COMPILER_RT_DEFAULT_TARGET_ABI is not set in base-config-ix.cmake, so we need to move this check into CMakeLists.txt.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@273957 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/base-config-ix.cmake')
| -rw-r--r-- | cmake/base-config-ix.cmake | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake index 0829344df..b02f35a6e 100644 --- a/cmake/base-config-ix.cmake +++ b/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) |