Skip to content

Commit ad94bc8

Browse files
committed
build: remove remnants of libdispatch staging (NFC)
libdispatch is required by Foundation. The `FOUNDATION_ENABLE_LIBDISPATCH` flag was removed a while ago from Foundation itself. Remove the handling for this option and simplify the flag handling.
1 parent 746b58e commit ad94bc8

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

utils/build-script-impl

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,18 +2135,6 @@ for host in "${ALL_HOSTS[@]}"; do
21352135
LIBICU_BUILD_ARGS=()
21362136
fi
21372137

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-
21502138
# FIXME: Always re-build XCTest on non-darwin platforms.
21512139
# The Swift project might have been changed, but CMake might
21522140
# not be aware and will not rebuild.
@@ -2169,7 +2157,10 @@ for host in "${ALL_HOSTS[@]}"; do
21692157
-DCMAKE_INSTALL_PREFIX:PATH=$(get_host_install_prefix ${host})
21702158

21712159
${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
21732164

21742165
# NOTE(compnerd) we disable tests because XCTest is not ready
21752166
# yet, but we will reconfigure when the time comes.
@@ -2605,16 +2596,6 @@ for host in "${ALL_HOSTS[@]}"; do
26052596
LIBICU_BUILD_ARGS=()
26062597
fi
26072598

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
26182599

26192600
SWIFTC_BIN="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
26202601
LLVM_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
@@ -2629,7 +2610,10 @@ for host in "${ALL_HOSTS[@]}"; do
26292610
-DCMAKE_INSTALL_PREFIX:PATH=$(get_host_install_prefix ${host})
26302611

26312612
${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
26332617

26342618
-DENABLE_TESTING:BOOL=YES
26352619
-DXCTest_DIR=$(build_directory ${host} xctest)/cmake/modules

0 commit comments

Comments
 (0)