diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2013-02-07 00:24:19 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2013-02-07 00:24:19 +0000 |
| commit | bdd4ec71dbcecb8bd9892777450e54cdba8ceb90 (patch) | |
| tree | e904a489a3dab78d58cad26a53a4d0d987f6f94a /libcxx | |
| parent | 6bd3374de2fd05a6ed84417f8efe8a336766111e (diff) | |
| download | bcm5719-llvm-bdd4ec71dbcecb8bd9892777450e54cdba8ceb90.tar.gz bcm5719-llvm-bdd4ec71dbcecb8bd9892777450e54cdba8ceb90.zip | |
[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.
llvm-svn: 174563
Diffstat (limited to 'libcxx')
| -rwxr-xr-x | libcxx/lib/buildit | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libcxx/lib/buildit b/libcxx/lib/buildit index 36222dcfc45..347c6c0b9ad 100755 --- a/libcxx/lib/buildit +++ b/libcxx/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 \ |
