commit 224f96067eff10cb2f94faa6030a01bd64ee0f95
author Eric Fiselier <eric@efcs.ca> Mon Jan 02 22:27:45 2017 +0000
committer Eric Fiselier <eric@efcs.ca> Mon Jan 02 22:27:45 2017 +0000
tree 4f4f5e862a1f6fbf7c8b7c4ef8782e08487d8ab4
parent fd0ef994ee9c26a718abc668a9e031a63ed9560d

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

src/new.cpp

diff --git a/src/new.cpp b/src/new.cpp
index 734d931..3d8b2a9 100644
--- a/src/new.cpp
+++ b/src/new.cpp
@@ -13,8 +13,7 @@
 
 #include "new"
 
-#if defined(__APPLE__) && !defined(LIBCXXRT) && \
-    !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)
+#if defined(__APPLE__) && !defined(LIBCXXRT)
     #include <cxxabi.h>
 
     #ifndef _LIBCPPABI_VERSION
@@ -27,8 +26,7 @@
     #if defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI)
         #include <cxxabi.h>
     #endif  // defined(LIBCXX_BUILDING_LIBCXXABI)
-    #if defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) || \
-        (!defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__))
+    #if !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__)
         static std::new_handler __new_handler;
     #endif  // _LIBCPPABI_VERSION
 #endif