[PATCH] D38044: Set ANDROID when any android abi is used, not just androideabi

Francis Ricci via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 19 10:27:19 PDT 2017


fjricci created this revision.
Herald added subscribers: mgorny, srhines.

https://reviews.llvm.org/D38044

Files:
  CMakeLists.txt


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -55,7 +55,7 @@
 endif()
 
 construct_compiler_rt_default_triple()
-if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" STREQUAL "androideabi")
+if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" MATCHES "^android")
   set(ANDROID 1)
 endif()
 if ("${COMPILER_RT_DEFAULT_TARGET_ABI}" MATCHES "hf$")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D38044.115862.patch
Type: text/x-patch
Size: 406 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170919/60b96c87/attachment.bin>


More information about the llvm-commits mailing list