Author: kledzik
Date: Thu Jun 9 18:31:35 2011
New Revision: 132819
URL: http://llvm.org/viewvc/llvm-project?rev=132819&view=rev
Log:
more Apple build system tweaks
Modified:
libcxx/trunk/lib/buildit
Modified: libcxx/trunk/lib/buildit
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/buildit?rev=132819&r1=132818&r2=132819&view=diff
==============================================================================
--- libcxx/trunk/lib/buildit (original)
+++ libcxx/trunk/lib/buildit Thu Jun 9 18:31:35 2011
@@ -55,13 +55,15 @@
-Wl,-unexported_symbols_list,libc++unexp.exp \
/usr/lib/libSystem.B.dylib"
else
- 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`
@@ -70,10 +72,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
;;
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
