[compiler-rt] r313652 - Set ANDROID when any android abi is used, not just androideabi

[Francis Ricci via llvm-commits]

Author: fjricci
Date: Tue Sep 19 10:56:27 2017
New Revision: 313652

URL: http://llvm.org/viewvc/llvm-project?rev=313652&view=rev
Log:
Set ANDROID when any android abi is used, not just androideabi

Reviewers: compnerd, beanz

Subscribers: srhines, mgorny, llvm-commits

Differential Revision: https://reviews.llvm.org/D38044

Change-Id: Idab521f187aba18977818d91503763e0e9d3aa0e

Modified:
    compiler-rt/trunk/CMakeLists.txt

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=313652&r1=313651&r2=313652&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Tue Sep 19 10:56:27 2017
@@ -71,7 +71,7 @@ if ("${COMPILER_RT_DEFAULT_TARGET_ABI}"
     set(COMPILER_RT_DEFAULT_TARGET_ARCH "armhf")
   endif()
 endif()
-if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi")
+if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" MATCHES "^android")
   set(ANDROID 1)
 endif()
 pythonize_bool(ANDROID)