[Lldb-commits] [lldb] r293282 - Fix android-i386 build broken by previous commit

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Fri Jan 27 04:58:23 PST 2017


Author: labath
Date: Fri Jan 27 06:58:23 2017
New Revision: 293282

URL: http://llvm.org/viewvc/llvm-project?rev=293282&view=rev
Log:
Fix android-i386 build broken by previous commit

I foolishly thought I could simplify the condition to cover all android
targets. I was wrong - i386 headers don't define __NR_accept.

Revert back to enabling the workaround on arm an mips only.

Modified:
    lldb/trunk/cmake/modules/LLDBConfig.cmake

Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=293282&r1=293281&r2=293282&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBConfig.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake Fri Jan 27 06:58:23 2017
@@ -412,7 +412,8 @@ if(LLDB_USE_BUILTIN_DEMANGLER)
     add_definitions(-DLLDB_USE_BUILTIN_DEMANGLER)
 endif()
 
-if ((CMAKE_SYSTEM_NAME MATCHES "Android") AND LLVM_BUILD_STATIC)
+if ((CMAKE_SYSTEM_NAME MATCHES "Android") AND LLVM_BUILD_STATIC AND
+    ((ANDROID_ABI MATCHES "armeabi") OR (ANDROID_ABI MATCHES "mips")))
   add_definitions(-DANDROID_BUILD_STATIC)
 endif()
 




More information about the lldb-commits mailing list