From bbe3db0f62c9b971f1a72057ddb4f668c5188b47 Mon Sep 17 00:00:00 2001
From: Chris Bieneman <beanz@apple.com>
Date: Mon, 27 Jun 2016 22:52:05 +0000
Subject: [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
---
 cmake/base-config-ix.cmake | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'cmake')

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)
-- 
cgit v1.2.3