@@ -470,70 +470,60 @@ function set_build_options_for_host() {
470
470
watchos-* | watchsimulator-* )
471
471
case ${host} in
472
472
macosx-x86_64)
473
- xcrun_sdk_name=" macosx"
474
473
llvm_target_arch=" "
475
474
SWIFT_HOST_TRIPLE=" x86_64-apple-macosx${DARWIN_DEPLOYMENT_VERSION_OSX} "
476
475
SWIFT_HOST_VARIANT_SDK=" OSX"
477
476
cmake_osx_deployment_target=" ${DARWIN_DEPLOYMENT_VERSION_OSX} "
478
477
;;
479
478
iphonesimulator-i386)
480
- xcrun_sdk_name=" iphonesimulator"
481
479
llvm_target_arch=" X86"
482
480
SWIFT_HOST_TRIPLE=" i386-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS} "
483
481
SWIFT_HOST_VARIANT_SDK=" IOS_SIMULATOR"
484
482
cmake_osx_deployment_target=" "
485
483
;;
486
484
iphonesimulator-x86_64)
487
- xcrun_sdk_name=" iphonesimulator"
488
485
llvm_target_arch=" X86"
489
486
SWIFT_HOST_TRIPLE=" x86_64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS} "
490
487
SWIFT_HOST_VARIANT_SDK=" IOS_SIMULATOR"
491
488
cmake_osx_deployment_target=" "
492
489
;;
493
490
iphoneos-armv7)
494
- xcrun_sdk_name=" iphoneos"
495
491
llvm_target_arch=" ARM"
496
492
SWIFT_HOST_TRIPLE=" armv7-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS} "
497
493
SWIFT_HOST_VARIANT_SDK=" IOS"
498
494
cmake_osx_deployment_target=" "
499
495
;;
500
496
iphoneos-armv7s)
501
- xcrun_sdk_name=" iphoneos"
502
497
llvm_target_arch=" ARM"
503
498
SWIFT_HOST_TRIPLE=" armv7s-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS} "
504
499
SWIFT_HOST_VARIANT_SDK=" IOS"
505
500
cmake_osx_deployment_target=" "
506
501
;;
507
502
iphoneos-arm64)
508
- xcrun_sdk_name=" iphoneos"
509
503
llvm_target_arch=" AArch64"
510
504
SWIFT_HOST_TRIPLE=" arm64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS} "
511
505
SWIFT_HOST_VARIANT_SDK=" IOS"
512
506
cmake_osx_deployment_target=" "
513
507
;;
514
508
appletvsimulator-x86_64)
515
- xcrun_sdk_name=" appletvsimulator"
516
509
llvm_target_arch=" X86"
517
510
SWIFT_HOST_TRIPLE=" x86_64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS} "
518
511
SWIFT_HOST_VARIANT_SDK=" TVOS_SIMULATOR"
519
512
cmake_osx_deployment_target=" "
520
513
;;
521
514
appletvos-arm64)
522
- xcrun_sdk_name=" appletvos"
523
515
llvm_target_arch=" AArch64"
524
516
SWIFT_HOST_TRIPLE=" arm64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS} "
525
517
SWIFT_HOST_VARIANT_SDK=" TVOS"
526
518
cmake_osx_deployment_target=" "
527
519
;;
528
520
watchsimulator-i386)
529
- xcrun_sdk_name=" watchsimulator"
530
521
llvm_target_arch=" X86"
531
522
SWIFT_HOST_TRIPLE=" i386-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS} "
532
523
SWIFT_HOST_VARIANT_SDK=" WATCHOS_SIMULATOR"
533
524
cmake_osx_deployment_target=" "
534
525
;;
535
526
watchos-armv7k)
536
- xcrun_sdk_name=" watchos"
537
527
llvm_target_arch=" ARM"
538
528
SWIFT_HOST_TRIPLE=" armv7k-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS} "
539
529
SWIFT_HOST_VARIANT_SDK=" WATCHOS"
@@ -560,12 +550,12 @@ function set_build_options_for_host() {
560
550
cmark_cmake_options=(
561
551
-DCMAKE_C_FLAGS=" $( cmark_c_flags ${host} ) "
562
552
-DCMAKE_CXX_FLAGS=" $( cmark_c_flags ${host} ) "
563
- -DCMAKE_OSX_SYSROOT:PATH=" $( xcrun --sdk ${xcrun_sdk_name } --show-sdk-path) "
553
+ -DCMAKE_OSX_SYSROOT:PATH=" $( xcrun --sdk ${platform } --show-sdk-path) "
564
554
-DCMAKE_OSX_DEPLOYMENT_TARGET=" ${cmake_osx_deployment_target} "
565
555
)
566
556
llvm_cmake_options=(
567
557
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=" ${cmake_osx_deployment_target} "
568
- -DCMAKE_OSX_SYSROOT:PATH=" $( xcrun --sdk ${xcrun_sdk_name } --show-sdk-path) "
558
+ -DCMAKE_OSX_SYSROOT:PATH=" $( xcrun --sdk ${platform } --show-sdk-path) "
569
559
-DCOMPILER_RT_ENABLE_IOS:BOOL=FALSE
570
560
-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
571
561
-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
0 commit comments