Skip to content

Commit 8788abe

Browse files
committed
Pass libdispatch source and build directories to Swift PM
1 parent 1d666d1 commit 8788abe

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

utils/build-script-impl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,6 +1522,10 @@ function set_swiftpm_bootstrap_command() {
15221522
LLBUILD_BIN="$(build_directory_bin ${LOCAL_HOST} llbuild)/swift-build-tool"
15231523
if [[ ! "${SKIP_BUILD_FOUNDATION}" ]] ; then
15241524
FOUNDATION_BUILD_DIR=$(build_directory ${host} foundation)
1525+
if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
1526+
LIBDISPATCH_BUILD_DIR="$(build_directory ${host} libdispatch)"
1527+
LIBDISPATCH_BUILD_ARGS="--libdispatch-source-dir=${LIBDISPATCH_SOURCE_DIR} --libdispatch-build-dir=${LIBDISPATCH_BUILD_DIR}"
1528+
fi
15251529
if [[ ! "${SKIP_BUILD_XCTEST}" ]] ; then
15261530
XCTEST_BUILD_DIR=$(build_directory ${host} xctest)
15271531
fi
@@ -1544,6 +1548,10 @@ function set_swiftpm_bootstrap_command() {
15441548
if [[ ! "${SKIP_BUILD_FOUNDATION}" ]] ; then
15451549
swiftpm_bootstrap_command+=(
15461550
--foundation="${FOUNDATION_BUILD_DIR}/Foundation")
1551+
if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
1552+
swiftpm_bootstrap_command+=(
1553+
$LIBDISPATCH_BUILD_ARGS)
1554+
fi
15471555
if [[ ! "${SKIP_BUILD_XCTEST}" ]] ; then
15481556
swiftpm_bootstrap_command+=(
15491557
--xctest="${XCTEST_BUILD_DIR}")

0 commit comments

Comments
 (0)