Partial fix for building w/ libcxxrt on OSX. Patch from C Bergstrom.

llvm-svn: 221029

diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp
index 3ce6f2e..b5c46c0 100644 (file)
--- a/libcxx/src/exception.cpp
+++ b/libcxx/src/exception.cpp
@@ -16,7 +16,7 @@
 #define __has_include(inc) 0
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(LIBCXXRT)
   #include <cxxabi.h>
 
   using namespace __cxxabiv1;

diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp
index 2b37601..a88d4cc 100644 (file)
--- a/libcxx/src/new.cpp
+++ b/libcxx/src/new.cpp
@@ -17,7 +17,7 @@
 #define __has_include(inc) 0
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(LIBCXXRT)
     #include <cxxabi.h>
 
     #ifndef _LIBCPPABI_VERSION