diff options
| -rw-r--r-- | lldb/tools/debugserver/source/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | lldb/unittests/tools/CMakeLists.txt | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt index 5e567d5dd72..63d3dc974dc 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -100,6 +100,7 @@ set(LLDB_CODESIGN_IDENTITY "lldb_codesign" if(NOT LLDB_CODESIGN_IDENTITY STREQUAL "") set(DEBUGSERVER_PATH $<TARGET_FILE:debugserver> CACHE PATH "Path to debugserver.") + set(SKIP_DEBUGSERVER OFF CACHE BOOL "Skip building the in-tree debug server") else() execute_process( COMMAND xcode-select -p @@ -107,7 +108,7 @@ else() string(STRIP ${XCODE_DEV_DIR} XCODE_DEV_DIR) set(DEBUGSERVER_PATH "${XCODE_DEV_DIR}/../SharedFrameworks/LLDB.framework/Resources/debugserver" CACHE PATH "Path to debugserver.") - set(SKIP_DEBUGSERVER True) + set(SKIP_DEBUGSERVER ON CACHE BOOL "Skip building the in-tree debug server") endif() message(STATUS "Path to the lldb debugserver: ${DEBUGSERVER_PATH}") @@ -124,7 +125,7 @@ if (APPLE) find_library(LOCKDOWN_LIBRARY lockdown) if(NOT BACKBOARD_LIBRARY) - set(SKIP_DEBUGSERVER True) + set(SKIP_DEBUGSERVER ON CACHE BOOL "Skip building the in-tree debug server" FORCE) endif() else() find_library(COCOA_LIBRARY Cocoa) diff --git a/lldb/unittests/tools/CMakeLists.txt b/lldb/unittests/tools/CMakeLists.txt index e3816217bb4..e4fc3e62c08 100644 --- a/lldb/unittests/tools/CMakeLists.txt +++ b/lldb/unittests/tools/CMakeLists.txt @@ -1,3 +1,8 @@ if(CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|Linux|NetBSD") - add_subdirectory(lldb-server) + if (CMAKE_SYSTEM_NAME MATCHES "Darwin" AND SKIP_DEBUGSERVER) + # 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() endif() |
