Revert r290839 - Fix configuring and building libc++ w/o an ABI library
llvm-svn: 290841
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 221596df3336a45d635b63293867fb1166a863ca
diff --git a/src/exception.cpp b/src/exception.cpp
index ec8969a..96bd7ee 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -12,8 +12,7 @@
#include "exception"
#include "new"
-#if defined(__APPLE__) && !defined(LIBCXXRT) && \
- !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)
+#if defined(__APPLE__) && !defined(LIBCXXRT)
#include <cxxabi.h>
using namespace __cxxabiv1;
@@ -107,8 +106,7 @@
int uncaught_exceptions() _NOEXCEPT
{
-#if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) && \
- (defined(__APPLE__) || defined(_LIBCPPABI_VERSION))
+#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION)
// on Darwin, there is a helper function so __cxa_get_globals is private
# if _LIBCPPABI_VERSION > 1101
return __cxa_uncaught_exceptions();