maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CMake] Simplify lldb-server handling 

We can piggyback off the existing add_lldb_tool_subdirectory to decide
whether or not lldb-server should be built.

Differential revision: https://reviews.llvm.org/D61872

llvm-svn: 360621
This commit is contained in:
Jonas Devlieghere 2019-05-13 21:25:02 +00:00
parent 1d662316cb
commit aeeeb37e37
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/cmake/modules/LLDBConfig.cmake
View File

@ -414,14 +414,10 @@ endif()
list(APPEND system_libs ${CMAKE_DL_LIBS})
SET(SKIP_LLDB_SERVER_BUILD OFF CACHE BOOL "Skip building lldb-server")
# Figure out if lldb could use lldb-server. If so, then we'll
# ensure we build lldb-server when an lldb target is being built.
if (CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|FreeBSD|Linux|NetBSD")
set(LLDB_CAN_USE_LLDB_SERVER 1)
else()
set(LLDB_CAN_USE_LLDB_SERVER 0)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|FreeBSD|Linux|NetBSD")
set(LLDB_TOOL_LLDB_SERVER_BUILD OFF)
endif()
# Figure out if lldb could use debugserver. If so, then we'll

5
lldb/tools/CMakeLists.txt
View File

@ -9,13 +9,10 @@ add_subdirectory(lldb-test EXCLUDE_FROM_ALL)
add_lldb_tool_subdirectory(lldb-instr)
add_lldb_tool_subdirectory(lldb-mi)
add_lldb_tool_subdirectory(lldb-server)
add_lldb_tool_subdirectory(lldb-vscode)
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
add_subdirectory(darwin-debug)
add_subdirectory(debugserver)
endif()
if (LLDB_CAN_USE_LLDB_SERVER AND NOT SKIP_LLDB_SERVER_BUILD)
add_subdirectory(lldb-server)
endif()

13
lldb/unittests/tools/CMakeLists.txt
View File

@ -1,9 +1,6 @@
add_subdirectory(lldb-mi)
if(CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|Linux|NetBSD")
if ((CMAKE_SYSTEM_NAME MATCHES "Darwin" AND SKIP_TEST_DEBUGSERVER) OR (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND SKIP_LLDB_SERVER_BUILD))
# These tests are meant to test lldb-server/debugserver in isolation, and
# don't provide any value if run against a server copied from somewhere.
else()
add_subdirectory(lldb-server)
endif()
if(LLDB_TOOL_LLDB_MI_BUILD)
add_subdirectory(lldb-mi)
endif()
if(LLDB_TOOL_LLDB_SERVER_BUILD)
add_subdirectory(lldb-server)
endif()