From 0feb616cb30a9d33d74edfa143525a6df126a61f Mon Sep 17 00:00:00 2001 From: Francis Ricci Date: Tue, 19 Sep 2017 17:56:27 +0000 Subject: 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 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@313652 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a3df7cc0e..c05403ebf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" MATCHES "hf$") 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) -- cgit v1.2.3