fix the lldb patches

This commit is contained in:
Sylvestre Ledru 2017-01-10 11:14:06 +00:00
parent d4ccf80cc8
commit b2b7c66f95
2 changed files with 24 additions and 25 deletions

View File

@ -11,12 +11,3 @@ Index: llvm-toolchain-3.9-3.9.1/lldb/source/Plugins/Process/gdb-remote/GDBRemote
#endif
#if defined (HAVE_LIBCOMPRESSION)
@@ -1175,7 +1175,7 @@ GDBRemoteCommunication::StartDebugserver
}
}
}
-
+ log->Printf("foo %s, debugserver_file_spec.GetPath ().c_str ());
if (debugserver_exists)
{
debugserver_file_spec.GetPath (debugserver_path, sizeof(debugserver_path));

View File

@ -1,5 +1,17 @@
diff --git a/lldb/cmake/LLDBDependencies.cmake b/cmake/LLDBDependencies.cmake
index 67d110e0a..ee4f7a6e3 100644
--- a/lldb.orig/cmake/LLDBDependencies.cmake
+++ b/lldb/cmake/LLDBDependencies.cmake
@@ -201,6 +201,7 @@ set(LLVM_LINK_COMPONENTS
option
support
coverage
+ DebugInfoPDB
)
if ( NOT LLDB_DISABLE_PYTHON )
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
index 75c522f65..3d868068c 100644
index af1605076..aa11a90d0 100644
--- a/lldb.orig/cmake/modules/AddLLDB.cmake
+++ b/lldb/cmake/modules/AddLLDB.cmake
@@ -93,7 +93,7 @@ macro(add_lldb_library name)
@ -11,18 +23,14 @@ index 75c522f65..3d868068c 100644
set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
endmacro(add_lldb_executable)
diff --git a/lldb/tools/lldb-server/CMakeLists.txt b/tools/lldb-server/CMakeLists.txt
index 28360914a..9d8a09b69 100644
--- a/lldb.orig/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})
diff --git a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt b/source/Plugins/SymbolFile/PDB/CMakeLists.txt
index 79d8a25d6..b22c928c5 100644
--- a/lldb.orig/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