Skip to content

Commit 7e74200

Browse files
committed
Configure XCTest for Dispatch if included in Foundation on Linux
1 parent 1d666d1 commit 7e74200

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

utils/build-script-impl

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2087,6 +2087,13 @@ for host in "${ALL_HOSTS[@]}"; do
20872087
SWIFTC_BIN="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
20882088
XCTEST_BUILD_DIR=$(build_directory ${host} xctest)
20892089
FOUNDATION_BUILD_DIR=$(build_directory ${host} foundation)
2090+
2091+
# Staging: require opt-in for building with dispatch
2092+
if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
2093+
LIBDISPATCH_BUILD_DIR="$(build_directory ${host} libdispatch)"
2094+
LIBDISPATCH_BUILD_ARGS="--libdispatch-src-dir=${LIBDISPATCH_SOURCE_DIR} --libdispatch-build-dir=${LIBDISPATCH_BUILD_DIR}"
2095+
fi
2096+
20902097
if [[ "$(uname -s)" == "Darwin" ]] ; then
20912098
# xcodebuild requires swift-stdlib-tool to build a Swift
20922099
# framework. This is normally present when building XCTest
@@ -2101,7 +2108,8 @@ for host in "${ALL_HOSTS[@]}"; do
21012108
call "${XCTEST_SOURCE_DIR}"/build_script.py \
21022109
--swiftc="${SWIFTC_BIN}" \
21032110
--build-dir="${XCTEST_BUILD_DIR}" \
2104-
--foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation"
2111+
--foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation" \
2112+
$LIBDISPATCH_BUILD_ARGS
21052113

21062114
# XCTest builds itself and doesn't rely on cmake
21072115
continue

0 commit comments

Comments
 (0)