diff options
| author | Eric Fiselier <eric@efcs.ca> | 2014-11-01 00:41:42 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2014-11-01 00:41:42 +0000 |
| commit | 22b131ffdd6ae767a41f373b75487624673fa28f (patch) | |
| tree | 83050655a3f19b029b359bf5bbe37da107a521af /libcxx/src | |
| parent | cd4872399a71fc7e4e1da088248048afd1a6bc70 (diff) | |
| download | bcm5719-llvm-22b131ffdd6ae767a41f373b75487624673fa28f.tar.gz bcm5719-llvm-22b131ffdd6ae767a41f373b75487624673fa28f.zip | |
Partial fix for building w/ libcxxrt on OSX. Patch from C Bergstrom.
llvm-svn: 221029
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/exception.cpp | 2 | ||||
| -rw-r--r-- | libcxx/src/new.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index 3ce6f2e1118..b5c46c0805e 100644 --- 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 2b37601cb18..a88d4cc7c24 100644 --- 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 |
