diff options
| author | Nick Kledzik <kledzik@apple.com> | 2011-06-09 23:31:35 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2011-06-09 23:31:35 +0000 |
| commit | 50aab549c09e1f94abd76b320555ed3a1a4d4a40 (patch) | |
| tree | 10a71cbc33ccf8658f176f468e18e333f834faba /libcxx/lib | |
| parent | c735f133687191a09f5a064f66742d38e359d92e (diff) | |
| download | bcm5719-llvm-50aab549c09e1f94abd76b320555ed3a1a4d4a40.tar.gz bcm5719-llvm-50aab549c09e1f94abd76b320555ed3a1a4d4a40.zip | |
more Apple build system tweaks
llvm-svn: 132819
Diffstat (limited to 'libcxx/lib')
| -rwxr-xr-x | libcxx/lib/buildit | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libcxx/lib/buildit b/libcxx/lib/buildit index 5961a3886c8..16df7c51d4b 100755 --- a/libcxx/lib/buildit +++ b/libcxx/lib/buildit @@ -55,13 +55,15 @@ case $TRIPLE in -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 @@ case $TRIPLE in -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 ;; |
