[Lldb-commits] [lldb] r258921 - Fix linking with LLVM_LINK_LLVM_DYLIB=ON

[Zachary Turner via lldb-commits]

Yea I think this is fine.

On Wed, Jan 27, 2016 at 9:29 AM Hans Wennborg <hans at chromium.org> wrote:

> Zach is the lldb cmake owner. Zach, does this seem OK for 3.8?
>
> On Wed, Jan 27, 2016 at 7:13 AM, Pavel Labath <labath at google.com> wrote:
> > Hi,
> >
> > could we get this patch applied to the 3.8 branch?
> >
> > thanks,
> > pl
> >
> >
> > On 27 January 2016 at 11:02, Pavel Labath via lldb-commits
> > <lldb-commits at lists.llvm.org> wrote:
> >> Author: labath
> >> Date: Wed Jan 27 05:02:02 2016
> >> New Revision: 258921
> >>
> >> URL: http://llvm.org/viewvc/llvm-project?rev=258921&view=rev
> >> Log:
> >> Fix linking with LLVM_LINK_LLVM_DYLIB=ON
> >>
> >> Linking with LLVM shared libraries currently produces linker errors.
> This works around the issue
> >> (pr24953) by disabling linking with llvm so for lldb libraries.
> >>
> >> Patch by Evangelos Foutras.
> >>
> >> Reviewers: zturner
> >>
> >> Subscribers: lldb-commits
> >>
> >> Differential Revision: http://reviews.llvm.org/D16293
> >>
> >> Modified:
> >>     lldb/trunk/cmake/modules/AddLLDB.cmake
> >>
> >> Modified: lldb/trunk/cmake/modules/AddLLDB.cmake
> >> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/AddLLDB.cmake?rev=258921&r1=258920&r2=258921&view=diff
> >>
> ==============================================================================
> >> --- lldb/trunk/cmake/modules/AddLLDB.cmake (original)
> >> +++ lldb/trunk/cmake/modules/AddLLDB.cmake Wed Jan 27 05:02:02 2016
> >> @@ -56,7 +56,7 @@ macro(add_lldb_library name)
> >>    if (PARAM_OBJECT)
> >>      add_library(${name} ${libkind} ${srcs})
> >>    else()
> >> -    llvm_add_library(${name} ${libkind} ${srcs})
> >> +    llvm_add_library(${name} ${libkind} DISABLE_LLVM_LINK_LLVM_DYLIB
> ${srcs})
> >>
> >>      lldb_link_common_libs(${name} "${libkind}")
> >>
> >> @@ -93,7 +93,7 @@ macro(add_lldb_library name)
> >>  endmacro(add_lldb_library)
> >>
> >>  macro(add_lldb_executable name)
> >> -  add_llvm_executable(${name} ${ARGN})
> >> +  add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
> >>    set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
> >>  endmacro(add_lldb_executable)
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20160127/00f02ed3/attachment.html>