Skip to content

Commit bef1e6d

Browse files
authored
Force foundation and libdispatch to re-build always on non-darwin platforms. (swiftlang#12736)
1 parent 60d8bd6 commit bef1e6d

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

utils/build-script-impl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2481,6 +2481,11 @@ for host in "${ALL_HOSTS[@]}"; do
24812481
continue
24822482
fi
24832483

2484+
# FIXME: Always re-build foundation on non-darwin platforms.
2485+
# Remove this when products build in the CMake system.
2486+
echo "Cleaning the Foundation build directory"
2487+
call rm -r "${build_dir}"
2488+
24842489
with_pushd "${FOUNDATION_SOURCE_DIR}" \
24852490
call env SWIFTC="${SWIFTC_BIN}" CLANG="${LLVM_BIN}"/clang SWIFT="${SWIFT_BIN}" \
24862491
SDKROOT="${SWIFT_BUILD_PATH}" BUILD_DIR="${build_dir}" DSTROOT="$(get_host_install_destdir ${host})" PREFIX="$(get_host_install_prefix ${host})" ./configure "${FOUNDATION_BUILD_TYPE}" ${FOUNDATION_BUILD_ARGS[@]} -DXCTEST_BUILD_DIR=${XCTEST_BUILD_DIR} $LIBDISPATCH_BUILD_ARGS
@@ -2526,6 +2531,7 @@ for host in "${ALL_HOSTS[@]}"; do
25262531
else
25272532
echo "Skipping reconfiguration of libdispatch"
25282533
fi
2534+
25292535
with_pushd "${LIBDISPATCH_BUILD_DIR}" \
25302536
call make
25312537
with_pushd "${LIBDISPATCH_BUILD_DIR}/tests" \
@@ -2535,6 +2541,11 @@ for host in "${ALL_HOSTS[@]}"; do
25352541
continue
25362542
;;
25372543
*)
2544+
# FIXME: Always re-build libdispatch on non-darwin platforms.
2545+
# Remove this when products build in the CMake system.
2546+
echo "Cleaning the libdispatch build directory"
2547+
call rm -r "${LIBDISPATCH_BUILD_DIR}"
2548+
25382549
cmake_options=(
25392550
${cmake_options[@]}
25402551
-DCMAKE_BUILD_TYPE:STRING="${LIBDISPATCH_BUILD_TYPE}"

0 commit comments

Comments
 (0)