Skip to content

Commit a1357c1

Browse files
committed
build: remove unnecessary variable (NFC)
The `platform` variable already contains the SDK name, no need to create a new variable for that.
1 parent 746b58e commit a1357c1

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

utils/build-script-impl

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -470,70 +470,60 @@ function set_build_options_for_host() {
470470
watchos-* | watchsimulator-*)
471471
case ${host} in
472472
macosx-x86_64)
473-
xcrun_sdk_name="macosx"
474473
llvm_target_arch=""
475474
SWIFT_HOST_TRIPLE="x86_64-apple-macosx${DARWIN_DEPLOYMENT_VERSION_OSX}"
476475
SWIFT_HOST_VARIANT_SDK="OSX"
477476
cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
478477
;;
479478
iphonesimulator-i386)
480-
xcrun_sdk_name="iphonesimulator"
481479
llvm_target_arch="X86"
482480
SWIFT_HOST_TRIPLE="i386-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
483481
SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
484482
cmake_osx_deployment_target=""
485483
;;
486484
iphonesimulator-x86_64)
487-
xcrun_sdk_name="iphonesimulator"
488485
llvm_target_arch="X86"
489486
SWIFT_HOST_TRIPLE="x86_64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
490487
SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
491488
cmake_osx_deployment_target=""
492489
;;
493490
iphoneos-armv7)
494-
xcrun_sdk_name="iphoneos"
495491
llvm_target_arch="ARM"
496492
SWIFT_HOST_TRIPLE="armv7-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
497493
SWIFT_HOST_VARIANT_SDK="IOS"
498494
cmake_osx_deployment_target=""
499495
;;
500496
iphoneos-armv7s)
501-
xcrun_sdk_name="iphoneos"
502497
llvm_target_arch="ARM"
503498
SWIFT_HOST_TRIPLE="armv7s-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
504499
SWIFT_HOST_VARIANT_SDK="IOS"
505500
cmake_osx_deployment_target=""
506501
;;
507502
iphoneos-arm64)
508-
xcrun_sdk_name="iphoneos"
509503
llvm_target_arch="AArch64"
510504
SWIFT_HOST_TRIPLE="arm64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
511505
SWIFT_HOST_VARIANT_SDK="IOS"
512506
cmake_osx_deployment_target=""
513507
;;
514508
appletvsimulator-x86_64)
515-
xcrun_sdk_name="appletvsimulator"
516509
llvm_target_arch="X86"
517510
SWIFT_HOST_TRIPLE="x86_64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS}"
518511
SWIFT_HOST_VARIANT_SDK="TVOS_SIMULATOR"
519512
cmake_osx_deployment_target=""
520513
;;
521514
appletvos-arm64)
522-
xcrun_sdk_name="appletvos"
523515
llvm_target_arch="AArch64"
524516
SWIFT_HOST_TRIPLE="arm64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS}"
525517
SWIFT_HOST_VARIANT_SDK="TVOS"
526518
cmake_osx_deployment_target=""
527519
;;
528520
watchsimulator-i386)
529-
xcrun_sdk_name="watchsimulator"
530521
llvm_target_arch="X86"
531522
SWIFT_HOST_TRIPLE="i386-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
532523
SWIFT_HOST_VARIANT_SDK="WATCHOS_SIMULATOR"
533524
cmake_osx_deployment_target=""
534525
;;
535526
watchos-armv7k)
536-
xcrun_sdk_name="watchos"
537527
llvm_target_arch="ARM"
538528
SWIFT_HOST_TRIPLE="armv7k-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
539529
SWIFT_HOST_VARIANT_SDK="WATCHOS"
@@ -560,12 +550,12 @@ function set_build_options_for_host() {
560550
cmark_cmake_options=(
561551
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
562552
-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)"
564554
-DCMAKE_OSX_DEPLOYMENT_TARGET="${cmake_osx_deployment_target}"
565555
)
566556
llvm_cmake_options=(
567557
-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)"
569559
-DCOMPILER_RT_ENABLE_IOS:BOOL=FALSE
570560
-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
571561
-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE

0 commit comments

Comments
 (0)