sgraenitz updated this revision to Diff 208695. sgraenitz added a comment. Add `include(LLVMDistributionSupport)` which went into the wrong patch
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D64399/new/ https://reviews.llvm.org/D64399 Files: lldb/CMakeLists.txt lldb/cmake/caches/Apple-lldb-macOS.cmake lldb/cmake/modules/LLDBStandalone.cmake Index: lldb/cmake/modules/LLDBStandalone.cmake =================================================================== --- lldb/cmake/modules/LLDBStandalone.cmake +++ lldb/cmake/modules/LLDBStandalone.cmake @@ -85,6 +85,7 @@ 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) Index: lldb/cmake/caches/Apple-lldb-macOS.cmake =================================================================== --- lldb/cmake/caches/Apple-lldb-macOS.cmake +++ lldb/cmake/caches/Apple-lldb-macOS.cmake @@ -15,5 +15,13 @@ # 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 "") Index: lldb/CMakeLists.txt =================================================================== --- lldb/CMakeLists.txt +++ lldb/CMakeLists.txt @@ -220,3 +220,7 @@ COMMENT "Copying Python DLL to LLDB binaries directory.") endif () endif () + +if(LLDB_BUILT_STANDALONE) + llvm_distribution_add_targets() +endif()
Index: lldb/cmake/modules/LLDBStandalone.cmake =================================================================== --- lldb/cmake/modules/LLDBStandalone.cmake +++ lldb/cmake/modules/LLDBStandalone.cmake @@ -85,6 +85,7 @@ 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) Index: lldb/cmake/caches/Apple-lldb-macOS.cmake =================================================================== --- lldb/cmake/caches/Apple-lldb-macOS.cmake +++ lldb/cmake/caches/Apple-lldb-macOS.cmake @@ -15,5 +15,13 @@ # 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 "") Index: lldb/CMakeLists.txt =================================================================== --- lldb/CMakeLists.txt +++ lldb/CMakeLists.txt @@ -220,3 +220,7 @@ COMMENT "Copying Python DLL to LLDB binaries directory.") endif () endif () + +if(LLDB_BUILT_STANDALONE) + llvm_distribution_add_targets() +endif()
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits