@@ -1804,7 +1804,8 @@ function set_swiftpm_bootstrap_command() {
1804
1804
--build=" ${build_dir} " )
1805
1805
if [[ ! " ${SKIP_BUILD_FOUNDATION} " ]] ; then
1806
1806
swiftpm_bootstrap_command+=(
1807
- --foundation=" ${FOUNDATION_BUILD_DIR} /Foundation" )
1807
+ --foundation=" ${FOUNDATION_BUILD_DIR} /Foundation"
1808
+ --foundation-install-prefix=" $( get_host_install_prefix ${host} ) " )
1808
1809
if [[ ! " ${SKIP_BUILD_LIBDISPATCH} " ]] ; then
1809
1810
swiftpm_bootstrap_command+=(
1810
1811
$LIBDISPATCH_BUILD_ARGS )
@@ -2467,7 +2468,7 @@ for host in "${ALL_HOSTS[@]}"; do
2467
2468
;;
2468
2469
swiftpm)
2469
2470
set_swiftpm_bootstrap_command
2470
- call " ${swiftpm_bootstrap_command[@]} "
2471
+ call " ${swiftpm_bootstrap_command[@]} " \
2471
2472
2472
2473
# swiftpm installs itself with a bootstrap method. No further cmake building is performed.
2473
2474
continue
@@ -2494,6 +2495,7 @@ for host in "${ALL_HOSTS[@]}"; do
2494
2495
--swiftc=" ${SWIFTC_BIN} " \
2495
2496
--build-dir=" ${XCTEST_BUILD_DIR} " \
2496
2497
--foundation-build-dir=" ${FOUNDATION_BUILD_DIR} /Foundation" \
2498
+ --foundation-install-prefix=" $( get_host_install_prefix ${host} ) " \
2497
2499
$LIBDISPATCH_BUILD_ARGS \
2498
2500
$XCTEST_BUILD_ARGS
2499
2501
@@ -2957,6 +2959,7 @@ for host in "${ALL_HOSTS[@]}"; do
2957
2959
call " ${XCTEST_SOURCE_DIR} " /build_script.py test \
2958
2960
--swiftc=" ${SWIFTC_BIN} " \
2959
2961
--foundation-build-dir=" ${FOUNDATION_BUILD_DIR} /Foundation" \
2962
+ --foundation-install-prefix=" $( get_host_install_prefix ${host} ) " \
2960
2963
${LIBDISPATCH_BUILD_ARGS} \
2961
2964
$XCTEST_BUILD_ARGS \
2962
2965
" ${XCTEST_BUILD_DIR} "
0 commit comments