mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-14 17:54:50 +00:00
d/p/lldb-server-link.diff Fix the lldb hang. It was due to a linking issue.
Thanks to Pavel Labath (Closes: #846640)
This commit is contained in:
parent
7f00e22bc5
commit
d4ccf80cc8
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -4,6 +4,8 @@ llvm-toolchain-3.9 (1:3.9.1-2) unstable; urgency=medium
|
|||||||
* Remove the info section from the generated manpages (Closes: #846269)
|
* Remove the info section from the generated manpages (Closes: #846269)
|
||||||
* Disable libedit usage in lldb because of garbage (Closes: #846616)
|
* Disable libedit usage in lldb because of garbage (Closes: #846616)
|
||||||
* Fix the path to lldb-server (to lldb-server-3.9) (Closes: #846638)
|
* Fix the path to lldb-server (to lldb-server-3.9) (Closes: #846638)
|
||||||
|
* 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> Sat, 17 Dec 2016 17:55:44 +0100
|
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 17 Dec 2016 17:55:44 +0100
|
||||||
|
|
||||||
|
28
debian/patches/lldb-server-link.diff
vendored
Normal file
28
debian/patches/lldb-server-link.diff
vendored
Normal 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
1
debian/patches/series
vendored
@ -43,3 +43,4 @@ upstream-asan-msan-fix-reallocation-logic.diff
|
|||||||
lit-force-lang.diff
|
lit-force-lang.diff
|
||||||
clang-arm-default-vfp3-on-armv7a.patch
|
clang-arm-default-vfp3-on-armv7a.patch
|
||||||
lldb-addversion-suffix-to-llvm-server-exec.patch
|
lldb-addversion-suffix-to-llvm-server-exec.patch
|
||||||
|
lldb-server-link.diff
|
||||||
|
Loading…
Reference in New Issue
Block a user