Skip to content

Commit 8722279

Browse files
committed
build-script-impl: remove CMark cases as unused
CMark was converted from a `build-script-impl` product to `build-script` product in #37102. After that change remaining mentions of CMark in `build-script-impl` were unused and can be removed.
1 parent 1f3e159 commit 8722279

File tree

1 file changed

+0
-68
lines changed

1 file changed

+0
-68
lines changed

utils/build-script-impl

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ KNOWN_SETTINGS=(
266266
)
267267

268268
components=(
269-
cmark
270269
foundation
271270
libcxx
272271
libdispatch
@@ -284,9 +283,6 @@ components=(
284283
)
285284
for component in ${components[@]} ; do
286285
component_skip_test_default=""
287-
if [[ "${component}" == "cmark" ]]; then
288-
component_skip_test_default="1"
289-
fi
290286
KNOWN_SETTINGS+=(
291287
${component}-build-type "Debug" "the build variant for ${component}"
292288
${component}-cmake-options "" "CMake options used for ${component}"
@@ -494,7 +490,6 @@ function verify_host_is_supported() {
494490
function set_build_options_for_host() {
495491
llvm_cmake_options=()
496492
swift_cmake_options=()
497-
cmark_cmake_options=()
498493
lldb_cmake_options=()
499494
llbuild_cmake_options=()
500495
SWIFT_HOST_VARIANT=
@@ -613,11 +608,6 @@ function set_build_options_for_host() {
613608
SWIFT_HOST_VARIANT_ARCH="arm64"
614609

615610
cmake_osx_deployment_target=""
616-
cmark_cmake_options=(
617-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
618-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
619-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
620-
)
621611
;;
622612
iphoneos-arm64)
623613
SWIFT_HOST_TRIPLE="arm64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
@@ -649,11 +639,6 @@ function set_build_options_for_host() {
649639
SWIFT_HOST_VARIANT_ARCH="arm64"
650640

651641
cmake_osx_deployment_target=""
652-
cmark_cmake_options=(
653-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
654-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
655-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
656-
)
657642
;;
658643
appletvos-arm64)
659644
SWIFT_HOST_TRIPLE="arm64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS}"
@@ -685,11 +670,6 @@ function set_build_options_for_host() {
685670
SWIFT_HOST_VARIANT_ARCH="arm64"
686671

687672
cmake_osx_deployment_target=""
688-
cmark_cmake_options=(
689-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
690-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
691-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
692-
)
693673
;;
694674
watchos-armv7k)
695675
SWIFT_HOST_TRIPLE="armv7k-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
@@ -725,13 +705,6 @@ function set_build_options_for_host() {
725705

726706
cmake_os_sysroot="$(xcrun --sdk ${platform} --show-sdk-path)"
727707

728-
cmark_cmake_options=(
729-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
730-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
731-
-DCMAKE_OSX_SYSROOT:PATH="${cmake_os_sysroot}"
732-
-DCMAKE_OSX_DEPLOYMENT_TARGET="${cmake_osx_deployment_target}"
733-
-DCMAKE_OSX_ARCHITECTURES="${architecture}"
734-
)
735708
llvm_cmake_options=(
736709
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="${cmake_osx_deployment_target}"
737710
-DCMAKE_OSX_SYSROOT:PATH="${cmake_os_sysroot}"
@@ -1233,7 +1206,6 @@ function get_stdlib_targets_for_host() {
12331206
NINJA_SOURCE_DIR="${WORKSPACE}/ninja"
12341207
SWIFT_SOURCE_DIR="${WORKSPACE}/swift"
12351208
LLVM_SOURCE_DIR="${WORKSPACE}/llvm-project/llvm"
1236-
CMARK_SOURCE_DIR="${WORKSPACE}/cmark"
12371209
LLDB_SOURCE_DIR="${WORKSPACE}/llvm-project/lldb"
12381210
LLBUILD_SOURCE_DIR="${WORKSPACE}/llbuild"
12391211
STRESSTEST_PACKAGE_DIR="${WORKSPACE}/swift-stress-tester"
@@ -1253,7 +1225,6 @@ SWIFT_SYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
12531225
# like tblgen that Swift relies on for building and testing. See the LLVM
12541226
# configure rules.
12551227
PRODUCTS=(llvm)
1256-
[[ "${SKIP_BUILD_CMARK}" ]] || PRODUCTS+=(cmark)
12571228
[[ "${SKIP_BUILD_LIBCXX}" ]] || PRODUCTS+=(libcxx)
12581229
[[ "${SKIP_BUILD_LIBICU}" ]] || PRODUCTS+=(libicu)
12591230
[[ "${SKIP_BUILD_SWIFT}" ]] || PRODUCTS+=(swift)
@@ -1318,9 +1289,6 @@ function build_directory_bin() {
13181289
root="$(build_directory ${host} ${product})"
13191290
if [[ "${CMAKE_GENERATOR}" == "Xcode" ]] ; then
13201291
case ${product} in
1321-
cmark)
1322-
echo "${root}/${CMARK_BUILD_TYPE}/bin"
1323-
;;
13241292
llvm)
13251293
echo "${root}/${LLVM_BUILD_TYPE}/bin"
13261294
;;
@@ -1416,10 +1384,6 @@ function llvm_c_flags() {
14161384
fi
14171385
}
14181386

1419-
function cmark_c_flags() {
1420-
echo -n " $(common_cross_c_flags $1 ${CMARK_BUILD_TYPE})"
1421-
}
1422-
14231387
function swift_c_flags() {
14241388
# Don't pass common_cross_c_flags to Swift because CMake code in the Swift
14251389
# project is itself aware of cross-compilation for the host tools and
@@ -1444,9 +1408,6 @@ function cmake_config_opt() {
14441408
# CMake automatically adds --target ALL_BUILD if we don't pass this.
14451409
echo "--target ZERO_CHECK "
14461410
case ${product} in
1447-
cmark)
1448-
echo "--config ${CMARK_BUILD_TYPE}"
1449-
;;
14501411
llvm)
14511412
echo "--config ${LLVM_BUILD_TYPE}"
14521413
;;
@@ -1745,18 +1706,6 @@ for host in "${ALL_HOSTS[@]}"; do
17451706
cmake_options+=("${product_cmake_options[@]}")
17461707

17471708
case ${product} in
1748-
cmark)
1749-
cmake_options=(
1750-
"${cmake_options[@]}"
1751-
-DCMAKE_BUILD_TYPE:STRING="${CMARK_BUILD_TYPE}"
1752-
"${cmark_cmake_options[@]}"
1753-
)
1754-
if [[ $(is_cross_tools_host ${host}) ]] ; then
1755-
cmake_options+=("${SWIFT_TARGET_CMAKE_OPTIONS[@]}")
1756-
fi
1757-
build_targets=(all)
1758-
;;
1759-
17601709
llvm)
17611710
if [[ -n "${LLVM_NINJA_TARGETS_FOR_CROSS_COMPILE_HOSTS}" && $(is_cross_tools_host ${host}) ]] ; then
17621711
build_targets=("${LLVM_NINJA_TARGETS_FOR_CROSS_COMPILE_HOSTS[@]}")
@@ -2077,7 +2026,6 @@ for host in "${ALL_HOSTS[@]}"; do
20772026
-DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"
20782027
-DClang_DIR:PATH=${llvm_build_dir}/lib/cmake/clang
20792028
-DLLVM_DIR:PATH=${llvm_build_dir}/lib/cmake/llvm
2080-
-DSWIFT_PATH_TO_CMARK_SOURCE:PATH="${CMARK_SOURCE_DIR}"
20812029
-DSWIFT_PATH_TO_CMARK_BUILD:PATH="$(build_directory ${host} cmark)"
20822030
-DSWIFT_PATH_TO_LIBDISPATCH_SOURCE:PATH="${LIBDISPATCH_SOURCE_DIR}"
20832031
-DSWIFT_PATH_TO_LIBDISPATCH_BUILD:PATH="$(build_directory ${host} libdispatch)"
@@ -2913,17 +2861,6 @@ for host in "${ALL_HOSTS[@]}"; do
29132861
fi
29142862

29152863
case ${product} in
2916-
cmark)
2917-
if [[ "${SKIP_TEST_CMARK}" ]]; then
2918-
continue
2919-
fi
2920-
executable_target=api_test
2921-
results_targets=(test)
2922-
if [[ "${CMAKE_GENERATOR}" == "Xcode" ]]; then
2923-
# Xcode generator uses "RUN_TESTS" instead of "test".
2924-
results_targets=(RUN_TESTS)
2925-
fi
2926-
;;
29272864
llvm)
29282865
continue # We don't test LLVM
29292866
;;
@@ -3249,11 +3186,6 @@ for host in "${ALL_HOSTS[@]}"; do
32493186
INSTALL_TARGETS="install"
32503187

32513188
case ${product} in
3252-
cmark)
3253-
if [[ -z "${INSTALL_CMARK}" ]] ; then
3254-
continue
3255-
fi
3256-
;;
32573189
llvm)
32583190
if [[ -z "${INSTALL_LLVM}" ]] ; then
32593191
continue

0 commit comments

Comments
 (0)