Merge pull request #82096 from bnbarham/cherry-pass-through-toolchain-version

[6.2][Build] Pass the toolchain version through to Swift's compilation

Author: bnbarham

utils/build.ps1

@@ -1758,6 +1758,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [switch] $Test) {
     Python3_INCLUDE_DIR = "$PythonRoot\include";
     Python3_LIBRARY = "$PythonRoot\libs\$PythonLibName.lib";
     Python3_ROOT_DIR = $PythonRoot;
+    SWIFT_TOOLCHAIN_VERSION = "${ToolchainIdentifier}";
     SWIFT_BUILD_SWIFT_SYNTAX = "YES";
     SWIFT_CLANG_LOCATION = (Get-PinnedToolchainToolsDir);
     SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";

utils/swift_build_support/swift_build_support/products/swift.py

@@ -10,6 +10,8 @@
 #
 # ----------------------------------------------------------------------------
 
+import os
+
 from build_swift.build_swift.constants import SWIFT_REPO_NAME
 
 from . import cmark
@@ -168,6 +170,11 @@ def _version_flags(self):
         if self.args.clang_compiler_version is not None:
             clang_compiler_version = self.args.clang_compiler_version
             r.define('CLANG_COMPILER_VERSION', str(clang_compiler_version))
+
+        toolchain_version = os.environ.get('TOOLCHAIN_VERSION')
+        if toolchain_version:
+            r.define('SWIFT_TOOLCHAIN_VERSION', toolchain_version)
+
         return r
 
     @property