Tentative fix for lldb-server build

This commit is contained in:
Pablo Oliveira 2016-09-09 17:26:16 +00:00
parent 92e7a77c55
commit b80e972653
3 changed files with 14 additions and 1 deletions

3
debian/changelog vendored
View File

@ -10,8 +10,9 @@ llvm-toolchain-snapshot (1:4.0~svn279916-2) UNRELEASED; urgency=medium
for real
* Also ship clang-reorder-fields as part of the clang-4.0 package
* Build lldb on arm64. Hopefully, works.
* Tentative fix for lldb-server build
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 27 Aug 2016 20:15:58 +0200
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 09 Sep 2016 19:11:37 +0200
llvm-toolchain-snapshot (1:4.0~svn279916-1) unstable; urgency=medium

11
debian/patches/fix-lldb-server-build vendored Normal file
View File

@ -0,0 +1,11 @@
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -486,7 +486,7 @@
# On DLL platforms symbols are imported from the tool by linking against it.
set(llvm_libs ${ARG_PLUGIN_TOOL})
elseif (DEFINED LLVM_LINK_COMPONENTS OR DEFINED ARG_LINK_COMPONENTS)
- if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
+ if (NOT ARG_STATIC AND LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB)
set(llvm_libs LLVM)
else()
llvm_map_components_to_libnames(llvm_libs

View File

@ -35,3 +35,4 @@ disable-source-interleave.diff
silent-gold-utils.diff
disable-llvm-symbolizer-test.diff
kfreebsd-support.diff
fix-lldb-server-build