Skip to content

Commit 3a24f59

Browse files
compnerdcompnerd
authored
Merge pull request swiftlang#28667 from xiaobai/leaving-my-cmark
[build] Reduce redundancy in setting cmark cmake options
2 parents c1bc32c + 3d50fa8 commit 3a24f59

File tree

1 file changed

+6
-61
lines changed

1 file changed

+6
-61
lines changed

‎utils/build-script-impl

Lines changed: 6 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -472,14 +472,7 @@ function set_build_options_for_host() {
472472
SWIFT_HOST_VARIANT="macosx"
473473
SWIFT_HOST_VARIANT_SDK="OSX"
474474
SWIFT_HOST_VARIANT_ARCH="x86_64"
475-
476475
cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
477-
cmark_cmake_options=(
478-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
479-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
480-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
481-
-DCMAKE_OSX_DEPLOYMENT_TARGET="${cmake_osx_deployment_target}"
482-
)
483476
;;
484477
iphonesimulator-i386)
485478
xcrun_sdk_name="iphonesimulator"
@@ -488,13 +481,7 @@ function set_build_options_for_host() {
488481
SWIFT_HOST_VARIANT="iphonesimulator"
489482
SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
490483
SWIFT_HOST_VARIANT_ARCH="i386"
491-
492484
cmake_osx_deployment_target=""
493-
cmark_cmake_options=(
494-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
495-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
496-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
497-
)
498485
;;
499486
iphonesimulator-x86_64)
500487
xcrun_sdk_name="iphonesimulator"
@@ -503,13 +490,7 @@ function set_build_options_for_host() {
503490
SWIFT_HOST_VARIANT="iphonesimulator"
504491
SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
505492
SWIFT_HOST_VARIANT_ARCH="x86_64"
506-
507493
cmake_osx_deployment_target=""
508-
cmark_cmake_options=(
509-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
510-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
511-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
512-
)
513494
;;
514495
iphoneos-armv7)
515496
xcrun_sdk_name="iphoneos"
@@ -518,13 +499,7 @@ function set_build_options_for_host() {
518499
SWIFT_HOST_VARIANT="iphoneos"
519500
SWIFT_HOST_VARIANT_SDK="IOS"
520501
SWIFT_HOST_VARIANT_ARCH="armv7"
521-
522502
cmake_osx_deployment_target=""
523-
cmark_cmake_options=(
524-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
525-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
526-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
527-
)
528503
;;
529504
iphoneos-armv7s)
530505
xcrun_sdk_name="iphoneos"
@@ -533,13 +508,7 @@ function set_build_options_for_host() {
533508
SWIFT_HOST_VARIANT="iphoneos"
534509
SWIFT_HOST_VARIANT_SDK="IOS"
535510
SWIFT_HOST_VARIANT_ARCH="armv7s"
536-
537511
cmake_osx_deployment_target=""
538-
cmark_cmake_options=(
539-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
540-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
541-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
542-
)
543512
;;
544513
iphoneos-arm64)
545514
xcrun_sdk_name="iphoneos"
@@ -548,13 +517,7 @@ function set_build_options_for_host() {
548517
SWIFT_HOST_VARIANT="iphoneos"
549518
SWIFT_HOST_VARIANT_SDK="IOS"
550519
SWIFT_HOST_VARIANT_ARCH="arm64"
551-
552520
cmake_osx_deployment_target=""
553-
cmark_cmake_options=(
554-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
555-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
556-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
557-
)
558521
;;
559522
appletvsimulator-x86_64)
560523
xcrun_sdk_name="appletvsimulator"
@@ -563,13 +526,7 @@ function set_build_options_for_host() {
563526
SWIFT_HOST_VARIANT="appletvsimulator"
564527
SWIFT_HOST_VARIANT_SDK="TVOS_SIMULATOR"
565528
SWIFT_HOST_VARIANT_ARCH="x86_64"
566-
567529
cmake_osx_deployment_target=""
568-
cmark_cmake_options=(
569-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
570-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
571-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
572-
)
573530
;;
574531
appletvos-arm64)
575532
xcrun_sdk_name="appletvos"
@@ -578,13 +535,7 @@ function set_build_options_for_host() {
578535
SWIFT_HOST_VARIANT="appletvos"
579536
SWIFT_HOST_VARIANT_SDK="TVOS"
580537
SWIFT_HOST_VARIANT_ARCH="arm64"
581-
582538
cmake_osx_deployment_target=""
583-
cmark_cmake_options=(
584-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
585-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
586-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
587-
)
588539
;;
589540
watchsimulator-i386)
590541
xcrun_sdk_name="watchsimulator"
@@ -593,13 +544,7 @@ function set_build_options_for_host() {
593544
SWIFT_HOST_VARIANT="watchsimulator"
594545
SWIFT_HOST_VARIANT_SDK="WATCHOS_SIMULATOR"
595546
SWIFT_HOST_VARIANT_ARCH="i386"
596-
597547
cmake_osx_deployment_target=""
598-
cmark_cmake_options=(
599-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
600-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
601-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
602-
)
603548
;;
604549
watchos-armv7k)
605550
xcrun_sdk_name="watchos"
@@ -608,13 +553,7 @@ function set_build_options_for_host() {
608553
SWIFT_HOST_VARIANT="watchos"
609554
SWIFT_HOST_VARIANT_SDK="WATCHOS"
610555
SWIFT_HOST_VARIANT_ARCH="armv7k"
611-
612556
cmake_osx_deployment_target=""
613-
cmark_cmake_options=(
614-
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
615-
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
616-
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
617-
)
618557
;;
619558
*)
620559
echo "Unknown host for swift tools: ${host}"
@@ -634,6 +573,12 @@ function set_build_options_for_host() {
634573
done
635574
fi
636575

576+
cmark_cmake_options=(
577+
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
578+
-DCMAKE_CXX_FLAGS="$(cmark_c_flags ${host})"
579+
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
580+
-DCMAKE_OSX_DEPLOYMENT_TARGET="${cmake_osx_deployment_target}"
581+
)
637582
llvm_cmake_options=(
638583
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="${cmake_osx_deployment_target}"
639584
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"

0 commit comments

Comments
 (0)