From 3be7f19317c67815d8ea92da2d708a20733e8274 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sat, 1 Nov 2014 00:41:42 +0000 Subject: [PATCH] Partial fix for building w/ libcxxrt on OSX. Patch from C Bergstrom. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@221029 91177308-0d34-0410-b5e6-96231b3b80d8 --- src/exception.cpp | 2 +- src/new.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/exception.cpp b/src/exception.cpp index 3ce6f2e1..b5c46c08 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 using namespace __cxxabiv1; diff --git a/src/new.cpp b/src/new.cpp index 2b37601c..a88d4cc7 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 #ifndef _LIBCPPABI_VERSION