Skip to content

Commit 85bce8d

Browse files
committed
add missing arg for Foundation prefix
1 parent e3438e4 commit 85bce8d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

utils/build-script-impl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,7 +1804,8 @@ function set_swiftpm_bootstrap_command() {
18041804
--build="${build_dir}")
18051805
if [[ ! "${SKIP_BUILD_FOUNDATION}" ]] ; then
18061806
swiftpm_bootstrap_command+=(
1807-
--foundation="${FOUNDATION_BUILD_DIR}/Foundation")
1807+
--foundation="${FOUNDATION_BUILD_DIR}/Foundation"
1808+
--foundation-install-prefix="$(get_host_install_prefix ${host})")
18081809
if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
18091810
swiftpm_bootstrap_command+=(
18101811
$LIBDISPATCH_BUILD_ARGS)
@@ -2467,7 +2468,7 @@ for host in "${ALL_HOSTS[@]}"; do
24672468
;;
24682469
swiftpm)
24692470
set_swiftpm_bootstrap_command
2470-
call "${swiftpm_bootstrap_command[@]}"
2471+
call "${swiftpm_bootstrap_command[@]}" \
24712472

24722473
# swiftpm installs itself with a bootstrap method. No further cmake building is performed.
24732474
continue
@@ -2494,6 +2495,7 @@ for host in "${ALL_HOSTS[@]}"; do
24942495
--swiftc="${SWIFTC_BIN}" \
24952496
--build-dir="${XCTEST_BUILD_DIR}" \
24962497
--foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation" \
2498+
--foundation-install-prefix="$(get_host_install_prefix ${host})" \
24972499
$LIBDISPATCH_BUILD_ARGS \
24982500
$XCTEST_BUILD_ARGS
24992501

@@ -2957,6 +2959,7 @@ for host in "${ALL_HOSTS[@]}"; do
29572959
call "${XCTEST_SOURCE_DIR}"/build_script.py test \
29582960
--swiftc="${SWIFTC_BIN}" \
29592961
--foundation-build-dir="${FOUNDATION_BUILD_DIR}/Foundation" \
2962+
--foundation-install-prefix="$(get_host_install_prefix ${host})" \
29602963
${LIBDISPATCH_BUILD_ARGS} \
29612964
$XCTEST_BUILD_ARGS \
29622965
"${XCTEST_BUILD_DIR}"

0 commit comments

Comments
 (0)