[libcxx] r221029 - Partial fix for building w/ libcxxrt on OSX. Patch from C Bergstrom.

[Eric Fiselier]

Author: ericwf
Date: Fri Oct 31 19:41:42 2014
New Revision: 221029

URL: http://llvm.org/viewvc/llvm-project?rev=221029&view=rev
Log:
Partial fix for building w/ libcxxrt on OSX. Patch from C Bergstrom.

Modified:
    libcxx/trunk/src/exception.cpp
    libcxx/trunk/src/new.cpp

Modified: libcxx/trunk/src/exception.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/exception.cpp?rev=221029&r1=221028&r2=221029&view=diff
==============================================================================
--- libcxx/trunk/src/exception.cpp (original)
+++ libcxx/trunk/src/exception.cpp Fri Oct 31 19:41:42 2014
@@ -16,7 +16,7 @@
 #define __has_include(inc) 0
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(LIBCXXRT)
   #include <cxxabi.h>
 
   using namespace __cxxabiv1;

Modified: libcxx/trunk/src/new.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/new.cpp?rev=221029&r1=221028&r2=221029&view=diff
==============================================================================
--- libcxx/trunk/src/new.cpp (original)
+++ libcxx/trunk/src/new.cpp Fri Oct 31 19:41:42 2014
@@ -17,7 +17,7 @@
 #define __has_include(inc) 0
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(LIBCXXRT)
     #include <cxxabi.h>
 
     #ifndef _LIBCPPABI_VERSION