diff options
| author |   Pavel Labath <labath@google.com> | 2017-01-09 09:57:08 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2017-01-09 09:57:08 +0000 |
| commit | c9fa114b284a406827ba6c3238a524e01774a331 (patch) | |
| tree | 5101f9efa7a5bbd37231ec81ccfe49dada9f19cf /lld/cmake | |
| parent | RuntimeDyldELF: don't create thunk if not needed (diff) | |
| download | llvm-project-c9fa114b284a406827ba6c3238a524e01774a331.tar.gz llvm-project-c9fa114b284a406827ba6c3238a524e01774a331.tar.bz2 llvm-project-c9fa114b284a406827ba6c3238a524e01774a331.zip | |
[lld][cmake] Fix LLVM_LINK_LLVM_DYLIB build
Summary:
Lld's build had a couple of issues which prevented a successfull
LLVM_LINK_LLVM_DYLIB compilation.
- add_llvm_library vs llvm_add_library: One adds a library to libLLVM.so, other
one doesn't. Lld was using the wrong one, causing symbols to be mupltiply
defined in things linking to libLLVM.
- confusion when to use LINK_LIBS vs LINK_COMPONENTS in llvm_add_library
- not using LLVM_LINK_COMPONENTS for add_lld_tool
With these fixes lld compiles and it's test suite passes both in
LLVM_LINK_LLVM_DYLIB mode and without it.
Reviewers: ruiu, beanz
Subscribers: llvm-commits, mgorny
Differential Revision: https://reviews.llvm.org/D28397
llvm-svn: 291432
Diffstat (limited to 'lld/cmake')
| -rw-r--r-- | lld/cmake/modules/AddLLD.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake index 752ca7f6b43c..906b2952a943 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake @@ -1,5 +1,5 @@ macro(add_lld_library name) - add_llvm_library(${name} ${ARGN}) + llvm_add_library(${name} ${ARGN}) set_target_properties(${name} PROPERTIES FOLDER "lld libraries") endmacro(add_lld_library) |