Skip to content

Commit 4cd9d26

Browse files
authored
Merge pull request #14835 from lanza/skinnypaths.swift
Add a SWIFT_BUILD_DIR variable to pass as an arugment to xctest/build_script.py
2 parents 418c77e + 4b8d4d9 commit 4cd9d26

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

utils/build-script-impl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,6 +2369,7 @@ for host in "${ALL_HOSTS[@]}"; do
23692369
SWIFTC_BIN="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
23702370
XCTEST_BUILD_DIR=$(build_directory ${host} xctest)
23712371
FOUNDATION_BUILD_DIR=$(build_directory ${host} foundation)
2372+
SWIFT_BUILD_DIR=$(build_directory ${host} swift)
23722373

23732374
# Staging: require opt-in for building with dispatch
23742375
if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
@@ -2387,6 +2388,7 @@ for host in "${ALL_HOSTS[@]}"; do
23872388
--swiftc="${SWIFTC_BIN}" \
23882389
--build-dir="${XCTEST_BUILD_DIR}" \
23892390
--foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation" \
2391+
--swift-build-dir="${SWIFT_BUILD_DIR}" \
23902392
$LIBDISPATCH_BUILD_ARGS \
23912393
$XCTEST_BUILD_ARGS
23922394

0 commit comments

Comments
 (0)