diff options
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/cmake/platforms/Android.cmake | 4 | ||||
| -rw-r--r-- | lldb/source/Host/common/Socket.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lldb/cmake/platforms/Android.cmake b/lldb/cmake/platforms/Android.cmake index c2102fc8024..54a938d1369 100644 --- a/lldb/cmake/platforms/Android.cmake +++ b/lldb/cmake/platforms/Android.cmake @@ -115,6 +115,10 @@ elseif( ANDROID_ABI STREQUAL "mips" ) list( APPEND LLDB_SYSTEM_LIBS atomic ) set( LLDB_SYSTEM_LIBS ${LLDB_SYSTEM_LIBS} CACHE INTERNAL "" FORCE ) endif() + if( LLVM_BUILD_STATIC ) + # Temporary workaround for static linking with the latest API. + set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -DANDROID_MIPS_BUILD_STATIC" ) + endif() endif() if( NOT LLVM_BUILD_STATIC ) diff --git a/lldb/source/Host/common/Socket.cpp b/lldb/source/Host/common/Socket.cpp index f7023de7d97..91a5e37424e 100644 --- a/lldb/source/Host/common/Socket.cpp +++ b/lldb/source/Host/common/Socket.cpp @@ -40,11 +40,11 @@ #include <asm-generic/errno-base.h> #include <errno.h> #include <arpa/inet.h> -#if defined(ANDROID_ARM_BUILD_STATIC) +#if defined(ANDROID_ARM_BUILD_STATIC) || defined(ANDROID_MIPS_BUILD_STATIC) #include <unistd.h> #include <sys/syscall.h> #include <fcntl.h> -#endif // ANDROID_ARM_BUILD_STATIC +#endif // ANDROID_ARM_BUILD_STATIC || ANDROID_MIPS_BUILD_STATIC #endif // __ANDROID_NDK__ using namespace lldb; @@ -457,7 +457,7 @@ Socket::AcceptSocket(NativeSocket sockfd, Error& error) { error.Clear(); -#if defined(ANDROID_ARM_BUILD_STATIC) +#if defined(ANDROID_ARM_BUILD_STATIC) || defined(ANDROID_MIPS_BUILD_STATIC) // Temporary workaround for statically linking Android lldb-server with the // latest API. int fd = syscall(__NR_accept, sockfd, addr, addrlen); |
