Skip to content

Commit d2681c0

Browse files
authored
Merge pull request swiftlang#28957 from compnerd/unused
build: remove unnecessary variable (NFC)
2 parents 101abe0 + a1357c1 commit d2681c0

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
@@ -462,70 +462,60 @@ function set_build_options_for_host() {
462462
watchos-* | watchsimulator-*)
463463
case ${host} in
464464
macosx-x86_64)
465-
xcrun_sdk_name="macosx"
466465
llvm_target_arch=""
467466
SWIFT_HOST_TRIPLE="x86_64-apple-macosx${DARWIN_DEPLOYMENT_VERSION_OSX}"
468467
SWIFT_HOST_VARIANT_SDK="OSX"
469468
cmake_osx_deployment_target="${DARWIN_DEPLOYMENT_VERSION_OSX}"
470469
;;
471470
iphonesimulator-i386)
472-
xcrun_sdk_name="iphonesimulator"
473471
llvm_target_arch="X86"
474472
SWIFT_HOST_TRIPLE="i386-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
475473
SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
476474
cmake_osx_deployment_target=""
477475
;;
478476
iphonesimulator-x86_64)
479-
xcrun_sdk_name="iphonesimulator"
480477
llvm_target_arch="X86"
481478
SWIFT_HOST_TRIPLE="x86_64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
482479
SWIFT_HOST_VARIANT_SDK="IOS_SIMULATOR"
483480
cmake_osx_deployment_target=""
484481
;;
485482
iphoneos-armv7)
486-
xcrun_sdk_name="iphoneos"
487483
llvm_target_arch="ARM"
488484
SWIFT_HOST_TRIPLE="armv7-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
489485
SWIFT_HOST_VARIANT_SDK="IOS"
490486
cmake_osx_deployment_target=""
491487
;;
492488
iphoneos-armv7s)
493-
xcrun_sdk_name="iphoneos"
494489
llvm_target_arch="ARM"
495490
SWIFT_HOST_TRIPLE="armv7s-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
496491
SWIFT_HOST_VARIANT_SDK="IOS"
497492
cmake_osx_deployment_target=""
498493
;;
499494
iphoneos-arm64)
500-
xcrun_sdk_name="iphoneos"
501495
llvm_target_arch="AArch64"
502496
SWIFT_HOST_TRIPLE="arm64-apple-ios${DARWIN_DEPLOYMENT_VERSION_IOS}"
503497
SWIFT_HOST_VARIANT_SDK="IOS"
504498
cmake_osx_deployment_target=""
505499
;;
506500
appletvsimulator-x86_64)
507-
xcrun_sdk_name="appletvsimulator"
508501
llvm_target_arch="X86"
509502
SWIFT_HOST_TRIPLE="x86_64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS}"
510503
SWIFT_HOST_VARIANT_SDK="TVOS_SIMULATOR"
511504
cmake_osx_deployment_target=""
512505
;;
513506
appletvos-arm64)
514-
xcrun_sdk_name="appletvos"
515507
llvm_target_arch="AArch64"
516508
SWIFT_HOST_TRIPLE="arm64-apple-tvos${DARWIN_DEPLOYMENT_VERSION_TVOS}"
517509
SWIFT_HOST_VARIANT_SDK="TVOS"
518510
cmake_osx_deployment_target=""
519511
;;
520512
watchsimulator-i386)
521-
xcrun_sdk_name="watchsimulator"
522513
llvm_target_arch="X86"
523514
SWIFT_HOST_TRIPLE="i386-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
524515
SWIFT_HOST_VARIANT_SDK="WATCHOS_SIMULATOR"
525516
cmake_osx_deployment_target=""
526517
;;
527518
watchos-armv7k)
528-
xcrun_sdk_name="watchos"
529519
llvm_target_arch="ARM"
530520
SWIFT_HOST_TRIPLE="armv7k-apple-watchos${DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
531521
SWIFT_HOST_VARIANT_SDK="WATCHOS"
@@ -552,12 +542,12 @@ function set_build_options_for_host() {
552542
cmark_cmake_options=(
553543
-DCMAKE_C_FLAGS="$(cmark_c_flags ${host})"
554544
-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)"
556546
-DCMAKE_OSX_DEPLOYMENT_TARGET="${cmake_osx_deployment_target}"
557547
)
558548
llvm_cmake_options=(
559549
-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)"
561551
-DCOMPILER_RT_ENABLE_IOS:BOOL=FALSE
562552
-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
563553
-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE

0 commit comments

Comments
 (0)