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

[Petr Hosek via Phabricator via libcxx-commits]

phosek added a comment.

In D60114#1451607 <https://reviews.llvm.org/D60114#1451607>, @ldionne wrote:

> This makes sense given the issue at hand, but we should really really move towards an approach based on `find_package` to find our dependencies.


I think that's the best approach long-term, but I'd like to land this one first and make that change as a follow up, since right now our ASan builds that use libc++ are broken because of this issue so I'd like to unbreak them.



================
Comment at: libcxx/cmake/Modules/HandleLibCXXABI.cmake:111
+    else()
+      set(CXXABI_SHARED_LIBNAME cxxabi_shared)
     endif()
----------------
Hahnfeld wrote:
> This should be `CXXABI_STATIC_LIBNAME`, no?
I've removed the condition altogether to simplify the logic.


================
Comment at: libcxx/lib/CMakeLists.txt:62-65
+    add_library_flags("-Wl,-force_load" "${LIBCXX_CXX_STATIC_ABI_LIBRARY}")
   else()
     add_library_flags("-Wl,--whole-archive" "-Wl,-Bstatic")
+    add_library_flags("${LIBCXX_CXX_STATIC_ABI_LIBRARY}")
----------------
Hahnfeld wrote:
> `LIBCXX_CXX_SHARED_ABI_LIBRARY`?
I've changed the logic so now it's actually correct.


Repository:
  rCXX libc++

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D60114/new/

https://reviews.llvm.org/D60114