summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2017-01-27 12:58:23 +0000
committerPavel Labath <labath@google.com>2017-01-27 12:58:23 +0000
commit810055ee232cd1c60714a14bdd13dde17590bc53 (patch)
treefb51e1374eae40650544c7fd6dab94cdad71face
parentef97630fd20d24ee508c8287a3d7d8699a59fbaa (diff)
downloadbcm5719-llvm-810055ee232cd1c60714a14bdd13dde17590bc53.tar.gz
bcm5719-llvm-810055ee232cd1c60714a14bdd13dde17590bc53.zip
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. llvm-svn: 293282
-rw-r--r--lldb/cmake/modules/LLDBConfig.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
index 0ee60a705af..70f53b24b87 100644
--- a/lldb/cmake/modules/LLDBConfig.cmake
+++ b/lldb/cmake/modules/LLDBConfig.cmake
@@ -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()
OpenPOWER on IntegriCloud