Author: ddunbar
Date: Wed Feb 6 18:24:19 2013
New Revision: 174563
URL: http://llvm.org/viewvc/llvm-project?rev=174563&view=rev
Log:
[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.
Modified:
libcxx/trunk/lib/buildit
Modified: libcxx/trunk/lib/buildit
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/buildit?rev=174563&r1=174562&r2=174563&view=diff
==============================================================================
--- libcxx/trunk/lib/buildit (original)
+++ libcxx/trunk/lib/buildit Wed Feb 6 18:24:19 2013
@@ -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 \
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
