[cfe-dev] 2 trivial patches for libc++

[Chandler Carruth]

On Wed, Oct 29, 2014 at 12:19 AM, C Bergström <cbergstrom at pathscale.com>
wrote:

> #2 The attached patch allows libc++ to use libcxxrt on OSX.
>

The CMake part has a bug:

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index cd8553c..d489c90 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -53,7 +53,7 @@ target_link_libraries(cxx ${libraries})
 append_if(compile_flags LIBCXX_HAS_FPIC_FLAG -fPIC)
 append_if(link_flags LIBCXX_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs)

-if ( APPLE )
+if ( APPLE AND "${LIBCXX_CXX_ABI}" STREQUAL "libcxxaib" )

This should be "libcxxabi"

Other than that (and needing to test this on OS X with libc++abi to make
sure the typo fix works) the CMake side looks fine. Sadly, the
exception.cpp code is stuff I have never rightly understood well enough to
help with. Hopefully Marshall or someone can help there.

-Chandler
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-dev/attachments/20141029/1647741f/attachment.html>