build-script: pass down the xcrun toolchain name to CMake, and to lit

Author: gribozavr

CMakeLists.txt

@@ -125,6 +125,9 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
     "Whether to enable CrashReporter integration"
     FALSE)
 
+set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
+    "The name of the toolchain to pass to 'xcrun'")
+
 set(SWIFT_DARWIN_ICU_INCLUDE_PATH "" CACHE STRING
     "Path to the directory where the ICU headers are located")
 

test/lit.cfg

@@ -447,8 +447,8 @@ if run_vendor == 'apple':
             xcrun_sdk_name = "appletvsimulator"
 
         xcrun_prefix = (
-            "xcrun --toolchain XcodeDefault --sdk %s" %
-            (xcrun_sdk_name, ))
+            "xcrun --toolchain %s --sdk %s" %
+            (config.darwin_xcrun_toolchain, xcrun_sdk_name))
         sdk_path = subprocess.check_output(
             [ "xcrun", "--sdk", xcrun_sdk_name, "--show-sdk-path" ]).rstrip()
         extra_frameworks_dir = os.path.join(
@@ -525,8 +525,8 @@ if run_vendor == 'apple':
 
         xcrun_sdk_name = "macosx"
         xcrun_prefix = (
-            "xcrun --toolchain XcodeDefault --sdk %s " %
-            (xcrun_sdk_name, ))
+            "xcrun --toolchain %s --sdk %s " %
+            (config.darwin_xcrun_toolchain, xcrun_sdk_name))
         sdk_path = subprocess.check_output(
             [ "xcrun", "--sdk", xcrun_sdk_name, "--show-sdk-path" ]).rstrip()
         extra_frameworks_dir = os.path.join(

test/lit.site.cfg.in

@@ -16,6 +16,7 @@ config.targets_to_build = "@TARGETS_TO_BUILD@"
 config.variant_triple = "@VARIANT_TRIPLE@"
 config.variant_sdk = "@VARIANT_SDK@"
 config.swiftlib_dir = "@LIT_SWIFTLIB_DIR@"
+config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@"
 
 if "@SWIFT_ASAN_BUILD@" == "TRUE":
     config.available_features.add("asan")

utils/build-script-impl

@@ -1463,6 +1463,11 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
         )
     fi
 
+    swift_cmake_options=(
+        "${swift_cmake_options[@]}"
+        -DSWIFT_DARWIN_XCRUN_TOOLCHAIN:STRING="${DARWIN_XCRUN_TOOLCHAIN}"
+    )
+
     if [[ "${DARWIN_STDLIB_INSTALL_NAME_DIR}" ]] ; then
         swift_cmake_options=(
             "${swift_cmake_options[@]}"

validation-test/lit.site.cfg.in

@@ -14,6 +14,7 @@ config.target_triple = "@TARGET_TRIPLE@"
 config.targets_to_build = "@TARGETS_TO_BUILD@"
 config.variant_triple = "@VARIANT_TRIPLE@"
 config.variant_sdk = "@VARIANT_SDK@"
+config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@"
 
 if "@SWIFT_ASAN_BUILD@" == "TRUE":
     config.available_features.add("asan")