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