aboutsummaryrefslogtreecommitdiff
path: root/libcxx/src/stdexcept.cpp
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2015-10-16 11:14:30 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2015-10-16 11:14:30 +0000
commit929df471a94c92ab744c5af7a33de5a0ad6699d2 (patch)
treed6533816fbd27b3ca5af1f68ef6d160d119c64d2 /libcxx/src/stdexcept.cpp
parent2fa025cdcf35b2c92fda7f1d47bfc33102bea0ac (diff)
downloadllvm-929df471a94c92ab744c5af7a33de5a0ad6699d2.zip
llvm-929df471a94c92ab744c5af7a33de5a0ad6699d2.tar.gz
llvm-929df471a94c92ab744c5af7a33de5a0ad6699d2.tar.bz2
Remove a long-standing __has_include hack.
This was put in to get libc++ building without libcxxabi. We now have macros that show that we are building against libcxxabi so use that instead. This guards against existing but broken cxxabi.h headers on the system. llvm-svn: 250507
Diffstat (limited to 'libcxx/src/stdexcept.cpp')
-rw-r--r--libcxx/src/stdexcept.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/libcxx/src/stdexcept.cpp b/libcxx/src/stdexcept.cpp
index aff4b18..577376e 100644
--- a/libcxx/src/stdexcept.cpp
+++ b/libcxx/src/stdexcept.cpp
@@ -13,12 +13,8 @@
#include "string"
#include "system_error"
-#ifndef __has_include
-#define __has_include(inc) 0
-#endif
-
/* For _LIBCPPABI_VERSION */
-#if __has_include(<cxxabi.h>) || defined(__APPLE_) || defined(LIBCXXRT)
+#if defined(LIBCXX_BUILDING_LIBCXXABI) || defined(__APPLE_) || defined(LIBCXXRT)
#include <cxxabi.h>
#endif