[libcxx-commits] [PATCH] D60114: [CMake] Differentiate between static and shared libc++abi

[Petr Hosek via Phabricator via libcxx-commits]

phosek created this revision.
phosek added reviewers: Hahnfeld, smeenai, ldionne, EricWF.
Herald added subscribers: libcxx-commits, dexonsmith, christof, mgorny.

This addresses the issue introduced in r354212 which broke the case when
static libc++abi is merged into static libc++, but shared libc++ is
linked against shared libc++. There are 4 different possible
combinations which is difficult to capture using a single variable. This
change splits LIBCXX_CXX_ABI_LIBRARY into two:
LIBCXX_CXX_SHARED_ABI_LIBRARY and LIBCXX_CXX_STATIC_ABI_LIBRARY to
handle the shared and static cases. This in turn allows simplification
of some of the logic around merging of static archives.


Repository:
  rCXX libc++

https://reviews.llvm.org/D60114

Files:
  libcxx/cmake/Modules/HandleLibCXXABI.cmake
  libcxx/lib/CMakeLists.txt

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60114.193238.patch
Type: text/x-patch
Size: 4959 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20190402/768485fa/attachment.bin>