@@ -171,9 +171,9 @@ if ($PinnedBuild -eq "") {
171
171
$PinnedVersion = " 6.0.3"
172
172
}
173
173
" ARM64" {
174
- $PinnedBuild = " https://download.swift.org/ swift-6.0.3-release/windows10-arm64/ swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-windows10 -arm64.exe"
175
- $PinnedSHA256 = " 81474651E59A9955C9E6A389EF53ABD61631FFC62C63A2A02977271019E7C722 "
176
- $PinnedVersion = " 6.0.3 "
174
+ $PinnedBuild = " https://github.com/thebrowsercompany/ swift-build/releases/download/ swift-6.0.0-20241216.0/installer -arm64.exe"
175
+ $PinnedSHA256 = " 9007ABBA15E863206C35EDA3285CD31F9196E81C046DBA911E76282E78F3103F "
176
+ $PinnedVersion = " 6.0.0 "
177
177
}
178
178
default { throw " Unsupported processor architecture" }
179
179
}
@@ -1858,16 +1858,20 @@ function Build-Dispatch([Platform]$Platform, $Arch, [switch]$Test = $false) {
1858
1858
$InstallPath = " $ ( $Arch.SDKInstallRoot ) \usr"
1859
1859
}
1860
1860
1861
- Build-CMakeProject `
1862
- - Src $SourceCache \swift- corelibs- libdispatch `
1863
- - Bin (Get-TargetProjectBinaryCache $Arch Dispatch) `
1864
- - InstallTo $InstallPath `
1865
- - Arch $Arch `
1866
- - Platform $Platform `
1867
- - UseBuiltCompilers C, CXX, Swift `
1868
- - Defines @ {
1869
- ENABLE_SWIFT = " YES" ;
1870
- }
1861
+ Isolate- EnvVars {
1862
+ $env: Path = " $ ( Get-CMarkBinaryCache $BuildArch ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1863
+
1864
+ Build-CMakeProject `
1865
+ - Src $SourceCache \swift- corelibs- libdispatch `
1866
+ - Bin (Get-TargetProjectBinaryCache $Arch Dispatch) `
1867
+ - InstallTo $InstallPath `
1868
+ - Arch $Arch `
1869
+ - Platform $Platform `
1870
+ - UseBuiltCompilers C, CXX, Swift `
1871
+ - Defines @ {
1872
+ ENABLE_SWIFT = " YES" ;
1873
+ }
1874
+ }
1871
1875
}
1872
1876
1873
1877
function Build-Foundation ([Platform ]$Platform , $Arch , [switch ]$Test = $false ) {
@@ -1919,6 +1923,8 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
1919
1923
(Get-Variable " ${Platform} $ ( $Arch.ShortName ) " - ValueOnly).SDKInstallRoot
1920
1924
}
1921
1925
1926
+ $env: Path = " $ ( Get-CMarkBinaryCache $BuildArch ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1927
+
1922
1928
Build-CMakeProject `
1923
1929
- Src $SourceCache \swift- corelibs- foundation `
1924
1930
- Bin $FoundationBinaryCache `
@@ -1969,7 +1975,7 @@ function Build-FoundationMacros() {
1969
1975
1970
1976
$SwiftSDK = $null
1971
1977
if ($Build ) {
1972
- $SwiftSDK = $BuildArch .SDKInstallRoot
1978
+ $SwiftSDK = $ ( Get-PinnedToolchainSDK )
1973
1979
}
1974
1980
1975
1981
$InstallDir = $null
@@ -1985,18 +1991,24 @@ function Build-FoundationMacros() {
1985
1991
Get-HostProjectCMakeModules Compilers
1986
1992
}
1987
1993
1988
- Build-CMakeProject `
1989
- - Src $SourceCache \swift- foundation\Sources\FoundationMacros `
1990
- - Bin $FoundationMacrosBinaryCache `
1991
- - InstallTo:$InstallDir `
1992
- - Arch $Arch `
1993
- - Platform $Platform `
1994
- - UseBuiltCompilers Swift `
1995
- - SwiftSDK:$SwiftSDK `
1996
- - BuildTargets:$Targets `
1997
- - Defines @ {
1998
- SwiftSyntax_DIR = $SwiftSyntaxCMakeModules ;
1994
+ Isolate- EnvVars {
1995
+ if ($Build ) {
1996
+ $env: Path = " $ ( Get-CMarkBinaryCache $BuildArch ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
1999
1997
}
1998
+
1999
+ Build-CMakeProject `
2000
+ - Src $SourceCache \swift- foundation\Sources\FoundationMacros `
2001
+ - Bin $FoundationMacrosBinaryCache `
2002
+ - InstallTo:$InstallDir `
2003
+ - Arch $Arch `
2004
+ - Platform $Platform `
2005
+ - UseBuiltCompilers Swift `
2006
+ - SwiftSDK:$SwiftSDK `
2007
+ - BuildTargets:$Targets `
2008
+ - Defines @ {
2009
+ SwiftSyntax_DIR = $SwiftSyntaxCMakeModules ;
2010
+ }
2011
+ }
2000
2012
}
2001
2013
2002
2014
function Build-XCTest ([Platform ]$Platform , $Arch , [switch ]$Test = $false ) {
@@ -2020,6 +2032,7 @@ function Build-XCTest([Platform]$Platform, $Arch, [switch]$Test = $false) {
2020
2032
$TestingDefines = @ { ENABLE_TESTING = " NO" }
2021
2033
$Targets = @ (" install" )
2022
2034
$InstallPath = " $ ( $Arch.XCTestInstallRoot ) \usr"
2035
+ $env: Path = " $ ( Get-CMarkBinaryCache $BuildArch ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
2023
2036
}
2024
2037
2025
2038
Build-CMakeProject `
@@ -2051,6 +2064,8 @@ function Build-Testing([Platform]$Platform, $Arch, [switch]$Test = $false) {
2051
2064
$InstallPath = " $ ( $Arch.SwiftTestingInstallRoot ) \usr"
2052
2065
}
2053
2066
2067
+ $env: Path = " $ ( Get-CMarkBinaryCache $BuildArch ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
2068
+
2054
2069
Build-CMakeProject `
2055
2070
- Src $SourceCache \swift- testing `
2056
2071
- Bin $SwiftTestingBinaryCache `
@@ -2605,7 +2620,7 @@ function Build-TestingMacros() {
2605
2620
2606
2621
$SwiftSDK = $null
2607
2622
if ($Build ) {
2608
- $SwiftSDK = $BuildArch .SDKInstallRoot
2623
+ $SwiftSDK = $ ( Get-PinnedToolchainSDK )
2609
2624
}
2610
2625
2611
2626
$Targets = if ($Build ) {
@@ -2627,18 +2642,24 @@ function Build-TestingMacros() {
2627
2642
Get-HostProjectCMakeModules Compilers
2628
2643
}
2629
2644
2630
- Build-CMakeProject `
2631
- - Src $SourceCache \swift- testing\Sources\TestingMacros `
2632
- - Bin $TestingMacrosBinaryCache `
2633
- - InstallTo:$InstallDir `
2634
- - Arch $Arch `
2635
- - Platform $Platform `
2636
- - UseBuiltCompilers Swift `
2637
- - SwiftSDK:$SwiftSDK `
2638
- - BuildTargets:$Targets `
2639
- - Defines @ {
2640
- SwiftSyntax_DIR = $SwiftSyntaxCMakeModules ;
2645
+ Isolate- EnvVars {
2646
+ if ($Build ) {
2647
+ $env: Path = " $ ( Get-CMarkBinaryCache $BuildArch ) \src;$ ( Get-PinnedToolchainRuntime ) ;${env: Path} "
2641
2648
}
2649
+
2650
+ Build-CMakeProject `
2651
+ - Src $SourceCache \swift- testing\Sources\TestingMacros `
2652
+ - Bin $TestingMacrosBinaryCache `
2653
+ - InstallTo:$InstallDir `
2654
+ - Arch $Arch `
2655
+ - Platform $Platform `
2656
+ - UseBuiltCompilers Swift `
2657
+ - SwiftSDK:$SwiftSDK `
2658
+ - BuildTargets:$Targets `
2659
+ - Defines @ {
2660
+ SwiftSyntax_DIR = $SwiftSyntaxCMakeModules ;
2661
+ }
2662
+ }
2642
2663
}
2643
2664
2644
2665
function Install-HostToolchain () {
0 commit comments