lldb-server-link

===================================================================

Gbp-Pq: Name lldb-server-link.diff

diff --git a/lldb/cmake/LLDBDependencies.cmake b/lldb/cmake/LLDBDependencies.cmake
index f018efb346294d877379587e449b255cb435ddf6..31f1493d63d41205162479fcc9929a759a0db419 100644 (file)
--- a/lldb/cmake/LLDBDependencies.cmake
+++ b/lldb/cmake/LLDBDependencies.cmake
@@ -207,6 +207,7 @@ set(LLVM_LINK_COMPONENTS
   option
   support
   coverage
+  DebugInfoPDB
   )
 
 if ( NOT LLDB_DISABLE_PYTHON )

diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
index af16050769adc9dd6555f5682507cb5debc9b0c8..aa11a90d016a568004479dd9858006ff2d5fbd8c 100644 (file)
--- 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/source/Plugins/SymbolFile/PDB/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
index 79d8a25d6979dae171a645d6fc1c461b29203207..b22c928c543d7345513560c794256014d91c7271 100644 (file)
--- a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
@@ -1,6 +1,3 @@
-set(LLVM_PRIVATE_LINK_COMPONENTS
-    DebugInfoPDB)
-
 add_lldb_library(lldbPluginSymbolFilePDB
   PDBASTParser.cpp
   SymbolFilePDB.cpp