proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-11-03 17:41:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/p/lldb-server-link.diff Fix the lldb hang. It was due to a linking issue.

Browse Source 
Thanks to Pavel Labath (Closes: #846640)
This commit is contained in:
Sylvestre Ledru 2017-01-09 20:24:27 +00:00
parent dac33f327f
commit 8a23e068a2
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -6,8 +6,10 @@ llvm-toolchain-3.8 (1:3.8.1-17) unstable; urgency=medium
* Fix the path to lldb-server (to lldb-server-3.8) (Closes: #846638)
* Also install python-lldb-3.8 when installing lldb-3.8 (Closes: #846612)
* Disable libedit usage in lldb because of garbage (Closes: #846616)
* d/p/lldb-server-link.diff Fix the lldb hang. It was due to a linking issue.
Thanks to Pavel Labath (Closes: #846640)
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 13 Nov 2016 13:38:01 +0100
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 09 Jan 2017 21:24:17 +0100
llvm-toolchain-3.8 (1:3.8.1-16) unstable; urgency=medium

28
debian/patches/lldb-server-link.diff vendored Normal file
View File

@ -0,0 +1,28 @@
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
index 75c522f65..3d868068c 100644
--- a/lldb.orig/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/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})

1
debian/patches/series vendored
View File

@ -55,3 +55,4 @@ upstream-asan-msan-fix-reallocation-logic.diff
lit-force-lang.diff
clang-arm-default-vfp3-on-armv7a.patch
lldb-server-path.diff
lldb-server-link.diff