Skip to content

Commit 4e264b4

Browse files
authored
Merge pull request #23315 from gottesmm/pr-6fbea3e8f9dfb6d37001beed5963b660e4bd4f4c
[build-script-impl] We do not support building libdispatch on macOS. …
2 parents 2d0fe53 + 9e7c2e7 commit 4e264b4

File tree

1 file changed

+3
-36
lines changed

1 file changed

+3
-36
lines changed

utils/build-script-impl

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2727,42 +2727,9 @@ for host in "${ALL_HOSTS[@]}"; do
27272727

27282728
case "${host}" in
27292729
macosx-*)
2730-
if [[ "${RECONFIGURE}" || ! -f "${LIBDISPATCH_BUILD_DIR}"/config.status ]]; then
2731-
echo "Reconfiguring libdispatch"
2732-
# First time building; need to run autotools and configure
2733-
if [[ "$LIBDISPATCH_BUILD_TYPE" == "Release" ]] ; then
2734-
dispatch_build_variant_arg="release"
2735-
elif [[ "$LIBDISPATCH_BUILD_TYPE" == "RelWithDebInfo" ]]; then
2736-
dispatch_build_variant_arg="releasedebuginfo"
2737-
else
2738-
dispatch_build_variant_arg="debug"
2739-
fi
2740-
2741-
if [ $(true_false "${BUILD_SWIFT_STATIC_STDLIB}") == "TRUE" ]; then
2742-
libdispatch_enable_static="--enable-static=yes"
2743-
else
2744-
libdispatch_enable_static=""
2745-
fi
2746-
2747-
call mkdir -p "${LIBDISPATCH_BUILD_DIR}"
2748-
with_pushd "${LIBDISPATCH_SOURCE_DIR}" \
2749-
call autoreconf -fvi
2750-
with_pushd "${LIBDISPATCH_BUILD_DIR}" \
2751-
call env CC="${LLVM_BIN}/clang" CXX="${LLVM_BIN}/clang++" SWIFTC="${SWIFTC_BIN}" \
2752-
"${LIBDISPATCH_SOURCE_DIR}"/configure --with-swift-toolchain="${SWIFT_BUILD_PATH}" \
2753-
--with-build-variant=$dispatch_build_variant_arg \
2754-
--prefix="$(get_host_install_destdir ${host})$(get_host_install_prefix ${host})" ${libdispatch_enable_static}
2755-
else
2756-
echo "Skipping reconfiguration of libdispatch"
2757-
fi
2758-
2759-
with_pushd "${LIBDISPATCH_BUILD_DIR}" \
2760-
call make
2761-
with_pushd "${LIBDISPATCH_BUILD_DIR}/tests" \
2762-
call make build-tests
2763-
2764-
# libdispatch builds itself and doesn't use cmake
2765-
continue
2730+
echo "Error: build-script does not support building libdispatch on macOS?!"
2731+
usage 1>&2
2732+
exit 1
27662733
;;
27672734
*)
27682735
# FIXME: Always re-build XCTest on non-darwin platforms.

0 commit comments

Comments
 (0)