copy swift-stdlib-tool in to xctoolchain

This commit is contained in:
Mishal Shah
2015-11-06 23:23:46 -08:00
parent 45a9c223d5
commit 76e99159c1

View File

@@ -1941,6 +1941,7 @@ if [[ "${DARWIN_INSTALL_EXTRACT_SYMBOLS}" ]] ; then
# Exclude shell scripts. # Exclude shell scripts.
(cd "${INSTALL_SYMROOT}" && (cd "${INSTALL_SYMROOT}" &&
find ./"${INSTALL_PREFIX}" -perm -0111 -type f -print | \ find ./"${INSTALL_PREFIX}" -perm -0111 -type f -print | \
grep -v swift-stdlib-tool | \
xargs -n 1 -P $(get_dsymutil_parallelism) $(xcrun_find_tool dsymutil)) xargs -n 1 -P $(get_dsymutil_parallelism) $(xcrun_find_tool dsymutil))
# Strip executables, shared libraries and static libraries in # Strip executables, shared libraries and static libraries in
@@ -1956,6 +1957,10 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
echo "--- Creating installable package ---" echo "--- Creating installable package ---"
echo "-- Package file: ${INSTALLABLE_PACKAGE} --" echo "-- Package file: ${INSTALLABLE_PACKAGE} --"
if [[ "$(uname -s)" == "Darwin" ]] ; then if [[ "$(uname -s)" == "Darwin" ]] ; then
if [ ! -f "${INSTALL_DESTDIR}/${INSTALL_PREFIX}/bin/swift-stdlib-tool" ] ; then
echo "--- Copy swift-stdlib-tool ---"
cp "${SWIFT_SOURCE_DIR}/utils/swift-stdlib-tool-substitute" "${INSTALL_DESTDIR}/${INSTALL_PREFIX}/bin/swift-stdlib-tool"
fi
# FIXME: Don't use gnutar on Darwin # FIXME: Don't use gnutar on Darwin
(cd "${INSTALL_DESTDIR}" && (cd "${INSTALL_DESTDIR}" &&
gnutar -c -z -f "${INSTALLABLE_PACKAGE}" --owner=0 --group=0 "${TOOLCHAIN_PREFIX/#\/}") gnutar -c -z -f "${INSTALLABLE_PACKAGE}" --owner=0 --group=0 "${TOOLCHAIN_PREFIX/#\/}")