This is an archive of the discontinued LLVM Phabricator instance.

Differential D23287

[libcxxabi] Add lib directory to linker paths when using libunwind
ClosedPublic

Authored by phosek on Aug 8 2016, 5:28 PM.

Details

Reviewers
compnerd
EricWF
Commits
rGb9a77f827dcf: Add lib directory to linker paths when using libunwind
rCXXA278076: Add lib directory to linker paths when using libunwind
rL278076: Add lib directory to linker paths when using libunwind
Summary

When using libunwind and not building as standalone project, we need to add LLVM library directory to the list of linker directories to ensure it can find libunwind dependency.

This wasn't previously needed since there was only only one unwind target and CMake resolved the name directly. However, with the latest change which allows building both static and shared version of libunwind in one build, that's no longer the case.

This fixes the failure introduced in the latest libunwind change.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek updated this revision to Diff 67258.Aug 8 2016, 5:28 PM
phosek retitled this revision from to [libcxxabi] Add lib directory to list of linker directories.
phosek updated this object.
phosek added reviewers: EricWF, compnerd.
phosek retitled this revision from [libcxxabi] Add lib directory to list of linker directories to [libcxxabi] Add lib directory to linker paths when using libunwind.
phosek added a subscriber: llvm-commits.
compnerd accepted this revision.Aug 8 2016, 5:32 PM
compnerd edited edge metadata.
This revision is now accepted and ready to land.Aug 8 2016, 5:32 PM
Closed by commit rL278076: Add lib directory to linker paths when using libunwind (authored by phosek). · Explain WhyAug 8 2016, 5:35 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxxabi/
trunk/
src/
3 lines

Diff 67259

libcxxabi/trunk/src/CMakeLists.txt

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Lines
if (LIBCXXABI_ENABLE_THREADS) if (LIBCXXABI_ENABLE_THREADS)
append_if(libraries LIBCXXABI_HAS_PTHREAD_LIB pthread) append_if(libraries LIBCXXABI_HAS_PTHREAD_LIB pthread)
endif() endif()
append_if(libraries LIBCXXABI_HAS_C_LIB c) append_if(libraries LIBCXXABI_HAS_C_LIB c)
if (LIBCXXABI_USE_LLVM_UNWINDER) if (LIBCXXABI_USE_LLVM_UNWINDER)
if (NOT LIBCXXABI_BUILT_STANDALONE)
link_directories(${LLVM_LIBRARY_DIR})
endif()
list(APPEND libraries unwind) list(APPEND libraries unwind)
else() else()
append_if(libraries LIBCXXABI_HAS_GCC_S_LIB gcc_s) append_if(libraries LIBCXXABI_HAS_GCC_S_LIB gcc_s)
endif() endif()
# Setup flags. # Setup flags.
append_if(LIBCXXABI_COMPILE_FLAGS LIBCXXABI_HAS_FPIC_FLAG -fPIC) append_if(LIBCXXABI_COMPILE_FLAGS LIBCXXABI_HAS_FPIC_FLAG -fPIC)
append_if(LIBCXXABI_LINK_FLAGS LIBCXXABI_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs) append_if(LIBCXXABI_LINK_FLAGS LIBCXXABI_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs)
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines