| 1 | --- ./tools/lldb/source/Host/CMakeLists.txt 2015-10-30 08:24:52.000000000 +0530 |
| 2 | +++ ./tools/lldb/source/Host/CMakeLists.txt 2017-01-10 21:14:16.132877692 +0530 |
| 3 | @@ -115,7 +115,7 @@ |
| 4 | macosx/cfcpp/CFCString.cpp |
| 5 | ) |
| 6 | |
| 7 | - elseif (CMAKE_SYSTEM_NAME MATCHES "Linux") |
| 8 | + elseif (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android") |
| 9 | if (__ANDROID_NDK__) |
| 10 | add_host_subdirectory(android |
| 11 | android/HostInfoAndroid.cpp |
| 12 | --- ./tools/lldb/scripts/Python/modules/CMakeLists.txt 2015-02-13 15:52:00.000000000 +0530 |
| 13 | +++ ./tools/lldb/scripts/Python/modules/CMakeLists.txt 2017-01-10 22:03:15.069857246 +0530 |
| 14 | @@ -5,7 +5,6 @@ |
| 15 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-macro-redefined") |
| 16 | endif () |
| 17 | |
| 18 | -# build the Python readline suppression module only on Linux |
| 19 | -if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT __ANDROID_NDK__) |
| 20 | +if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android") |
| 21 | add_subdirectory(readline) |
| 22 | endif() |
| 23 | --- ./tools/lldb/tools/lldb-server/CMakeLists.txt 2016-01-29 17:29:57.000000000 +0530 |
| 24 | +++ ./tools/lldb/tools/lldb-server/CMakeLists.txt 2017-01-10 22:06:03.981423698 +0530 |
| 25 | @@ -1,4 +1,4 @@ |
| 26 | -if ( CMAKE_SYSTEM_NAME MATCHES "Linux" ) |
| 27 | +if ( CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android" ) |
| 28 | include_directories( |
| 29 | ../../../../llvm/include |
| 30 | ../../source/Plugins/Process/Linux |
| 31 | --- ./tools/lldb/source/CMakeLists.txt 2015-10-24 05:57:04.000000000 +0530 |
| 32 | +++ ./tools/lldb/source/CMakeLists.txt 2017-01-10 22:10:44.805026352 +0530 |
| 33 | @@ -1,6 +1,6 @@ |
| 34 | include_directories(.) |
| 35 | |
| 36 | -if ( CMAKE_SYSTEM_NAME MATCHES "Linux" ) |
| 37 | +if ( CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android" ) |
| 38 | include_directories( |
| 39 | Plugins/Process/Linux |
| 40 | Plugins/Process/POSIX |
| 41 | --- ./tools/lldb/source/Plugins/Platform/CMakeLists.txt 2015-10-24 05:57:04.000000000 +0530 |
| 42 | +++ ./tools/lldb/source/Plugins/Platform/CMakeLists.txt 2017-01-10 22:15:36.255075635 +0530 |
| 43 | @@ -1,4 +1,4 @@ |
| 44 | -#if (CMAKE_SYSTEM_NAME MATCHES "Linux") |
| 45 | +#if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android") |
| 46 | add_subdirectory(Linux) |
| 47 | #elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") |
| 48 | add_subdirectory(FreeBSD) |
| 49 | --- ./tools/lldb/source/Plugins/Process/CMakeLists.txt 2015-10-28 23:51:45.000000000 +0530 |
| 50 | +++ ./tools/lldb/source/Plugins/Process/CMakeLists.txt 2017-01-10 22:18:20.019868513 +0530 |
| 51 | @@ -1,4 +1,4 @@ |
| 52 | -if (CMAKE_SYSTEM_NAME MATCHES "Linux") |
| 53 | +if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android") |
| 54 | add_subdirectory(Linux) |
| 55 | add_subdirectory(POSIX) |
| 56 | elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") |
| 57 | --- ./tools/llvm-shlib/CMakeLists.txt 2016-05-26 10:05:35.000000000 +0530 |
| 58 | +++ ./tools/llvm-shlib/CMakeLists.txt 2017-01-12 16:43:02.136137108 +0530 |
| 59 | @@ -39,7 +39,7 @@ |
| 60 | add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) |
| 61 | |
| 62 | list(REMOVE_DUPLICATES LIB_NAMES) |
| 63 | -if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf" |
| 64 | +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Android") # FIXME: It should be "GNU ld for elf" |
| 65 | # GNU ld doesn't resolve symbols in the version script. |
| 66 | set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) |
| 67 | elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") |