@@ -266,7 +266,6 @@ KNOWN_SETTINGS=(
266
266
)
267
267
268
268
components=(
269
- cmark
270
269
foundation
271
270
libcxx
272
271
libdispatch
@@ -284,9 +283,6 @@ components=(
284
283
)
285
284
for component in ${components[@]} ; do
286
285
component_skip_test_default=" "
287
- if [[ " ${component} " == " cmark" ]]; then
288
- component_skip_test_default=" 1"
289
- fi
290
286
KNOWN_SETTINGS+=(
291
287
${component} -build-type " Debug" " the build variant for ${component} "
292
288
${component} -cmake-options " " " CMake options used for ${component} "
@@ -494,7 +490,6 @@ function verify_host_is_supported() {
494
490
function set_build_options_for_host() {
495
491
llvm_cmake_options=()
496
492
swift_cmake_options=()
497
- cmark_cmake_options=()
498
493
lldb_cmake_options=()
499
494
llbuild_cmake_options=()
500
495
SWIFT_HOST_VARIANT=
@@ -613,11 +608,6 @@ function set_build_options_for_host() {
613
608
SWIFT_HOST_VARIANT_ARCH=" arm64"
614
609
615
610
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
- )
621
611
;;
622
612
iphoneos-arm64)
623
613
SWIFT_HOST_TRIPLE=" arm64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS} "
@@ -649,11 +639,6 @@ function set_build_options_for_host() {
649
639
SWIFT_HOST_VARIANT_ARCH=" arm64"
650
640
651
641
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
- )
657
642
;;
658
643
appletvos-arm64)
659
644
SWIFT_HOST_TRIPLE=" arm64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS} "
@@ -685,11 +670,6 @@ function set_build_options_for_host() {
685
670
SWIFT_HOST_VARIANT_ARCH=" arm64"
686
671
687
672
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
- )
693
673
;;
694
674
watchos-armv7k)
695
675
SWIFT_HOST_TRIPLE=" armv7k-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS} "
@@ -725,13 +705,6 @@ function set_build_options_for_host() {
725
705
726
706
cmake_os_sysroot=" $( xcrun --sdk ${platform} --show-sdk-path) "
727
707
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
- )
735
708
llvm_cmake_options=(
736
709
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=" ${cmake_osx_deployment_target} "
737
710
-DCMAKE_OSX_SYSROOT:PATH=" ${cmake_os_sysroot} "
@@ -1253,7 +1226,6 @@ SWIFT_SYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
1253
1226
# like tblgen that Swift relies on for building and testing. See the LLVM
1254
1227
# configure rules.
1255
1228
PRODUCTS=(llvm)
1256
- [[ " ${SKIP_BUILD_CMARK} " ]] || PRODUCTS+=(cmark)
1257
1229
[[ " ${SKIP_BUILD_LIBCXX} " ]] || PRODUCTS+=(libcxx)
1258
1230
[[ " ${SKIP_BUILD_LIBICU} " ]] || PRODUCTS+=(libicu)
1259
1231
[[ " ${SKIP_BUILD_SWIFT} " ]] || PRODUCTS+=(swift)
@@ -1318,9 +1290,6 @@ function build_directory_bin() {
1318
1290
root=" $( build_directory ${host} ${product} ) "
1319
1291
if [[ " ${CMAKE_GENERATOR} " == " Xcode" ]] ; then
1320
1292
case ${product} in
1321
- cmark)
1322
- echo " ${root} /${CMARK_BUILD_TYPE} /bin"
1323
- ;;
1324
1293
llvm)
1325
1294
echo " ${root} /${LLVM_BUILD_TYPE} /bin"
1326
1295
;;
@@ -1416,10 +1385,6 @@ function llvm_c_flags() {
1416
1385
fi
1417
1386
}
1418
1387
1419
- function cmark_c_flags() {
1420
- echo -n " $( common_cross_c_flags $1 ${CMARK_BUILD_TYPE} ) "
1421
- }
1422
-
1423
1388
function swift_c_flags() {
1424
1389
# Don't pass common_cross_c_flags to Swift because CMake code in the Swift
1425
1390
# project is itself aware of cross-compilation for the host tools and
@@ -1444,9 +1409,6 @@ function cmake_config_opt() {
1444
1409
# CMake automatically adds --target ALL_BUILD if we don't pass this.
1445
1410
echo " --target ZERO_CHECK "
1446
1411
case ${product} in
1447
- cmark)
1448
- echo " --config ${CMARK_BUILD_TYPE} "
1449
- ;;
1450
1412
llvm)
1451
1413
echo " --config ${LLVM_BUILD_TYPE} "
1452
1414
;;
@@ -1745,18 +1707,6 @@ for host in "${ALL_HOSTS[@]}"; do
1745
1707
cmake_options+=(" ${product_cmake_options[@]} " )
1746
1708
1747
1709
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
-
1760
1710
llvm)
1761
1711
if [[ -n " ${LLVM_NINJA_TARGETS_FOR_CROSS_COMPILE_HOSTS} " && $( is_cross_tools_host ${host} ) ]] ; then
1762
1712
build_targets=(" ${LLVM_NINJA_TARGETS_FOR_CROSS_COMPILE_HOSTS[@]} " )
@@ -2913,17 +2863,6 @@ for host in "${ALL_HOSTS[@]}"; do
2913
2863
fi
2914
2864
2915
2865
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
- ;;
2927
2866
llvm)
2928
2867
continue # We don't test LLVM
2929
2868
;;
@@ -3249,11 +3188,6 @@ for host in "${ALL_HOSTS[@]}"; do
3249
3188
INSTALL_TARGETS=" install"
3250
3189
3251
3190
case ${product} in
3252
- cmark)
3253
- if [[ -z " ${INSTALL_CMARK} " ]] ; then
3254
- continue
3255
- fi
3256
- ;;
3257
3191
llvm)
3258
3192
if [[ -z " ${INSTALL_LLVM} " ]] ; then
3259
3193
continue
0 commit comments