generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[build/Darwin] Use the correct libc++abi reexport list.

Browse Source 
- This updates the build script to match the change originally in r149634, so
   that we re-export symbols from libc++abi appropriately.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@174563 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2013-02-07 00:24:19 +00:00
parent fd329a445e
commit 6afc7ad3eb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/buildit
View File

@ -57,7 +57,6 @@ case $TRIPLE in
-Wl,-unexported_symbols_list,libc++unexp.exp \ -Wl,-unexported_symbols_list,libc++unexp.exp \
/usr/lib/libSystem.B.dylib" /usr/lib/libSystem.B.dylib"
else else
RE_EXPORT_LINE="/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,libc++abi.exp"
if [ -n "$SDKROOT" ] if [ -n "$SDKROOT" ]
then then
EXTRA_FLAGS+="-isysroot ${SDKROOT}" EXTRA_FLAGS+="-isysroot ${SDKROOT}"
@ -69,6 +68,15 @@ case $TRIPLE in
fi fi
CXX=`xcrun -sdk "${SDKROOT}" -find clang++` CXX=`xcrun -sdk "${SDKROOT}" -find clang++`
CC=`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 fi
LDSHARED_FLAGS="-o libc++.1.dylib \ LDSHARED_FLAGS="-o libc++.1.dylib \
-dynamiclib -nodefaultlibs \ -dynamiclib -nodefaultlibs \