From 6afc7ad3eb8ec43f638445c660a56160632c2f77 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Thu, 7 Feb 2013 00:24:19 +0000
Subject: [PATCH] [build/Darwin] Use the correct libc++abi reexport list.

 - This updates the build script to match the change originally in r149634, so
   that we re-export symbols from libc++abi appropriately.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@174563 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/buildit | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/buildit b/lib/buildit
index 36222dcf..347c6c0b 100755
--- a/lib/buildit
+++ b/lib/buildit
@@ -57,7 +57,6 @@ case $TRIPLE in
             -Wl,-unexported_symbols_list,libc++unexp.exp  \
             /usr/lib/libSystem.B.dylib"
     else
-        RE_EXPORT_LINE="/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++abi.exp"
         if [ -n "$SDKROOT" ]
         then
             EXTRA_FLAGS+="-isysroot ${SDKROOT}"
@@ -69,6 +68,15 @@ case $TRIPLE in
             fi
             CXX=`xcrun -sdk "${SDKROOT}"  -find clang++`
             CC=`xcrun -sdk "${SDKROOT}"  -find clang`
+        else
+            # Check if we have _LIBCPPABI_VERSION, to determine the reexport list to use.
+            if (echo "#include <cxxabi.h>" | $CXX -E -dM -x c++ - | \
+                grep _LIBCPPABI_VERSION > /dev/null)
+            then
+                RE_EXPORT_LINE="/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++abi2.exp"
+            else
+                RE_EXPORT_LINE="/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++abi.exp"
+            fi
         fi
         LDSHARED_FLAGS="-o libc++.1.dylib \
             -dynamiclib -nodefaultlibs  \