@@ -2135,18 +2135,6 @@ for host in "${ALL_HOSTS[@]}"; do
2135
2135
LIBICU_BUILD_ARGS=()
2136
2136
fi
2137
2137
2138
- # Staging: require opt-in for building with dispatch
2139
- if [[ ! " ${SKIP_BUILD_LIBDISPATCH} " ]] ; then
2140
- LIBDISPATCH_BUILD_DIR=" $( build_directory ${host} libdispatch) "
2141
- LIBDISPATCH_BUILD_ARGS=(
2142
- -DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=${LIBDISPATCH_SOURCE_DIR}
2143
- -DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=${LIBDISPATCH_BUILD_DIR}
2144
- -Ddispatch_DIR=${LIBDISPATCH_BUILD_DIR} /cmake/modules
2145
- )
2146
- else
2147
- LIBDISPATCH_BUILD_ARGS=( -DFOUNDATION_ENABLE_LIBDISPATCH=NO )
2148
- fi
2149
-
2150
2138
# FIXME: Always re-build XCTest on non-darwin platforms.
2151
2139
# The Swift project might have been changed, but CMake might
2152
2140
# not be aware and will not rebuild.
@@ -2169,7 +2157,10 @@ for host in "${ALL_HOSTS[@]}"; do
2169
2157
-DCMAKE_INSTALL_PREFIX:PATH=$( get_host_install_prefix ${host} )
2170
2158
2171
2159
${LIBICU_BUILD_ARGS[@]}
2172
- ${LIBDISPATCH_BUILD_ARGS[@]}
2160
+
2161
+ -DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=${LIBDISPATCH_SOURCE_DIR}
2162
+ -DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=$( build_directory ${host} libdispatch)
2163
+ -Ddispatch_DIR=$( build_directory ${host} libdispatch) /cmake/modules
2173
2164
2174
2165
# NOTE(compnerd) we disable tests because XCTest is not ready
2175
2166
# yet, but we will reconfigure when the time comes.
@@ -2605,16 +2596,6 @@ for host in "${ALL_HOSTS[@]}"; do
2605
2596
LIBICU_BUILD_ARGS=()
2606
2597
fi
2607
2598
2608
- if [[ ! " ${SKIP_BUILD_LIBDISPATCH} " ]] ; then
2609
- LIBDISPATCH_BUILD_DIR=" $( build_directory ${host} libdispatch) "
2610
- LIBDISPATCH_BUILD_ARGS=(
2611
- -DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=${LIBDISPATCH_SOURCE_DIR}
2612
- -DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=${LIBDISPATCH_BUILD_DIR}
2613
- -Ddispatch_DIR=${LIBDISPATCH_BUILD_DIR} /cmake/modules
2614
- )
2615
- else
2616
- LIBDISPATCH_BUILD_ARGS=( -DFOUNDATION_ENABLE_LIBDISPATCH=NO )
2617
- fi
2618
2599
2619
2600
SWIFTC_BIN=" $( build_directory_bin ${LOCAL_HOST} swift) /swiftc"
2620
2601
LLVM_BIN=" $( build_directory_bin ${LOCAL_HOST} llvm) "
@@ -2629,7 +2610,10 @@ for host in "${ALL_HOSTS[@]}"; do
2629
2610
-DCMAKE_INSTALL_PREFIX:PATH=$( get_host_install_prefix ${host} )
2630
2611
2631
2612
${LIBICU_BUILD_ARGS[@]}
2632
- ${LIBDISPATCH_BUILD_ARGS[@]}
2613
+
2614
+ -DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=${LIBDISPATCH_SOURCE_DIR}
2615
+ -DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=$( build_directory ${host} libdispatch)
2616
+ -Ddispatch_DIR=$( build_directory ${host} libdispatch) /cmake/modules
2633
2617
2634
2618
-DENABLE_TESTING:BOOL=YES
2635
2619
-DXCTest_DIR=$( build_directory ${host} xctest) /cmake/modules
0 commit comments