more Apple build system tweaks
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/tags/libcpp-23.1@132818 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/buildit b/lib/buildit
index 643339a..28fea37 100755
--- a/lib/buildit
+++ b/lib/buildit
@@ -54,13 +54,15 @@
/usr/lib/libSystem.B.dylib"
else
EXTRA_FLAGS="-std=c++0x "
- RE_EXPORT_FILE="libc++abi.exp"
+ RE_EXPORT_LINE="/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++abi.exp"
if [ -n "$SDKROOT" ]
then
EXTRA_FLAGS+="-isysroot ${SDKROOT}"
- if [ "${RC_armv7}" = "YES" ]
+ if echo "${RC_ARCHS}" | grep -q "armv7"
then
- RE_EXPORT_FILE="libc++sjlj-abi.exp"
+ RE_EXPORT_LINE="${SDKROOT}/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++sjlj-abi.exp"
+ else
+ RE_EXPORT_LINE="-Wl,-reexport_library,${SDKROOT}/usr/lib/libc++abi.dylib"
fi
CXX=`xcrun -sdk "${SDKROOT}" -find clang++`
CC=`xcrun -sdk "${SDKROOT}" -find clang`
@@ -69,10 +71,9 @@
-dynamiclib -nodefaultlibs \
-current_version ${RC_ProjectSourceVersion} -compatibility_version 1 \
-install_name /usr/lib/libc++.1.dylib \
- ${SDKROOT}/usr/lib/libc++abi.dylib \
-lSystem \
-Wl,-unexported_symbols_list,libc++unexp.exp \
- -Wl,-reexported_symbols_list,${RE_EXPORT_FILE} \
+ ${RE_EXPORT_LINE} \
-Wl,-force_symbols_not_weak_list,notweak.exp "
fi
;;
