averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2951 from dgrove-oss/specify-clang-when-building-libdispatch

Browse Source 
use the toolchain's clang when building libdispatch
This commit is contained in:
Tony Parker
2016-06-21 11:10:50 -07:00
committed by GitHub
parent ee82af023d d1ba8e043e
commit c62ed91931
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/build-script-impl
View File

@@ -2176,6 +2176,8 @@ for host in "${ALL_HOSTS[@]}"; do
libdispatch)
LIBDISPATCH_BUILD_DIR=$(build_directory ${host} ${product})
SWIFT_BUILD_PATH="$(build_directory ${host} swift)"
SWIFTC_BIN="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
LLVM_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
if [[ ! -f "${LIBDISPATCH_BUILD_DIR}"/config.status ]]; then
# First time building; need to run autotools and configure
@@ -2183,7 +2185,10 @@ for host in "${ALL_HOSTS[@]}"; do
with_pushd "${LIBDISPATCH_SOURCE_DIR}" \
call autoreconf -fvi
with_pushd "${LIBDISPATCH_BUILD_DIR}" \
call "${LIBDISPATCH_SOURCE_DIR}"/configure --prefix="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})" --with-swift-toolchain="${SWIFT_BUILD_PATH}"
call env CC="${LLVM_BIN}/clang" CCX="${LLVM_BIN}/clang" SWIFTC="${SWIFTC_BIN}" \
"${LIBDISPATCH_SOURCE_DIR}"/configure --with-swift-toolchain="${SWIFT_BUILD_PATH}" \
--prefix="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})"
fi
with_pushd "${LIBDISPATCH_BUILD_DIR}" \
call make