Skip to content

Commit 2cd780d

Browse files
committed
Build the runtime of all the Windows architectures before building SDKs
In order to get the 'built swift compiler' to work before building the SDK components so that regardless of the order of architectures in the `WindowsSDKs`. This previously worked because X64 happened to be the first in `WindowsSDKs` and we always built on X64. This avoids a build failure in the Windows ARM64 libdispatch build on Windows ARM64 caused by the Windows ARM64 runtime that hasn't been built yet.
1 parent bc8a9e4 commit 2cd780d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

utils/build.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2799,9 +2799,10 @@ if (-not $SkipBuild) {
27992799
Invoke-BuildStep Build-XML2 Windows $Arch
28002800
Invoke-BuildStep Build-CURL Windows $Arch
28012801
Invoke-BuildStep Build-LLVM Windows $Arch
2802-
2803-
# Build platform: SDK, Redist and XCTest
28042802
Invoke-BuildStep Build-Runtime Windows $Arch
2803+
}
2804+
foreach ($Arch in $WindowsSDKArchs) {
2805+
# Build platform: SDK, Redist and XCTest
28052806
Invoke-BuildStep Build-Dispatch Windows $Arch
28062807
# FIXME(compnerd) ensure that the _build_ is the first arch and don't rebuild on each arch
28072808
Invoke-BuildStep Build-FoundationMacros -Build Windows $BuildArch

0 commit comments

Comments
 (0)