averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Passes the value of the environment variable `TOOLCHAIN_VERSION` through
to Swift's `SWIFT_TOOLCHAIN_VERSION` for use in eg.
`-print-target-info` (and some day, `--version`).

(cherry picked from commit 3982ebbbb3)
This commit is contained in:
Ben Barham
2025-06-06 13:16:17 -07:00
parent 4051ea2e78
commit 849cd8ee9a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
utils/build.ps1
View File

@@ -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";

7
utils/swift_build_support/swift_build_support/products/swift.py
View File

@@ -10,6 +10,8 @@
#
# ----------------------------------------------------------------------------
import os
from build_swift.build_swift.constants import SWIFT_REPO_NAME
from . import cmark
@@ -168,6 +170,11 @@ updated without updating swift.py?")
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