commit 86c674e959d55af3a4afa4342d400cdc96d26233
author Eric Fiselier <eric@efcs.ca> Sat Nov 01 00:41:42 2014 +0000
committer Eric Fiselier <eric@efcs.ca> Sat Nov 01 00:41:42 2014 +0000
tree fc933c0c2c04b8e9fe7862d40c717973ea37b6d2
parent 11ec44138b50ed6726ba183b8abb3685852aaee8

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

llvm-svn: 221029
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 22b131ffdd6ae767a41f373b75487624673fa28f

src/exception.cpp

diff --git a/src/exception.cpp b/src/exception.cpp
index 3ce6f2e..b5c46c0 100644
--- a/src/exception.cpp
+++ b/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;

src/new.cpp

diff --git a/src/new.cpp b/src/new.cpp
index 2b37601..a88d4cc 100644
--- a/src/new.cpp
+++ b/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