From 260375980ea2bb69c8396859d66d595599b222df Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Tue, 25 Apr 2017 17:46:34 +0000 Subject: [PATCH] lldb-server-link Gbp-Pq: Name lldb-server-link.diff --- lldb/cmake/modules/AddLLDB.cmake | 2 +- lldb/tools/lldb-server/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index 75c522f6..3d868068 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -93,7 +93,7 @@ macro(add_lldb_library name) endmacro(add_lldb_library) macro(add_lldb_executable name) - add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN}) + add_llvm_executable(${name} ${ARGN}) set_target_properties(${name} PROPERTIES FOLDER "lldb executables") endmacro(add_lldb_executable) diff --git a/lldb/tools/lldb-server/CMakeLists.txt b/lldb/tools/lldb-server/CMakeLists.txt index 28360914..9d8a09b6 100644 --- a/lldb/tools/lldb-server/CMakeLists.txt +++ b/lldb/tools/lldb-server/CMakeLists.txt @@ -43,7 +43,9 @@ else() target_link_libraries(lldb-server ${LLDB_USED_LIBS}) target_link_libraries(lldb-server ${CLANG_USED_LIBS}) endif() -llvm_config(lldb-server ${LLVM_LINK_COMPONENTS}) +if (NOT LLVM_LINK_LLVM_DYLIB) + llvm_config(lldb-server ${LLVM_LINK_COMPONENTS}) +endif() target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS}) -- 2.30.2