diff options
-rw-r--r-- | lldb/CMakeLists.txt | 4 | ||||
-rw-r--r-- | lldb/cmake/caches/Apple-lldb-macOS.cmake | 10 | ||||
-rw-r--r-- | lldb/cmake/modules/LLDBStandalone.cmake | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 87af3fe0242..47bd854c744 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -216,3 +216,7 @@ if (NOT LLDB_DISABLE_PYTHON) COMMENT "Copying Python DLL to LLDB binaries directory.") endif () endif () + +if(LLDB_BUILT_STANDALONE) + llvm_distribution_add_targets() +endif() diff --git a/lldb/cmake/caches/Apple-lldb-macOS.cmake b/lldb/cmake/caches/Apple-lldb-macOS.cmake index 81ff59385cf..944fc906c51 100644 --- a/lldb/cmake/caches/Apple-lldb-macOS.cmake +++ b/lldb/cmake/caches/Apple-lldb-macOS.cmake @@ -15,5 +15,13 @@ set(LLDB_FRAMEWORK_INSTALL_DIR /Applications/Xcode.app/Contents/SharedFrameworks # Release builds may change these: set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11 CACHE STRING "") -set(LLDB_USE_SYSTEM_DEBUGSERVER ON CACHE BOOL "") +set(LLDB_USE_SYSTEM_DEBUGSERVER OFF CACHE BOOL "") set(LLVM_EXTERNALIZE_DEBUGINFO OFF CACHE BOOL "") + +set(LLVM_DISTRIBUTION_COMPONENTS + lldb + liblldb + lldb-argdumper + darwin-debug + debugserver + CACHE STRING "") diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index 8c30f84f070..afe4cbbe08f 100644 --- a/lldb/cmake/modules/LLDBStandalone.cmake +++ b/lldb/cmake/modules/LLDBStandalone.cmake @@ -85,6 +85,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) include(TableGen) include(HandleLLVMOptions) include(CheckAtomic) + include(LLVMDistributionSupport) if (PYTHON_EXECUTABLE STREQUAL "") set(Python_ADDITIONAL_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5) |