Merge pull request swiftlang#84229 from compnerd/hoisting

compnerd · web-flow · commit d8879e628445 · 2025-09-12T12:16:20.000-07:00
build.ps1: hoist `Build-CompilerRuntimes` out of `Build-SDK`
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -2333,7 +2333,7 @@ function Build-LLVM([Hashtable] $Platform) {
 }
 
 function Build-CompilerRuntime([Hashtable] $Platform) {
-  $LLVMBinaryCache = $(Get-ProjectBinaryCache $Platform LLVM)
+  $LLVMBinaryCache = $(Get-ProjectBinaryCache $HostPlatform Compilers)
 
   $LITVersionStr = $(Invoke-Program $(Get-PythonExecutable) "$LLVMBinaryCache\bin\llvm-lit.py" --version)
   if (-not $ToBatch -and -not ($LITVersionStr -match "lit (\d+)\.\d+\.\d+.*")) {
@@ -3920,6 +3920,15 @@ if (-not $SkipBuild) {
   Invoke-BuildStep Build-XML2 $HostPlatform
   Invoke-BuildStep Build-CDispatch $HostPlatform
   Invoke-BuildStep Build-Compilers $HostPlatform -Variant "Asserts"
+  $KnownPlatforms.Values | Where-Object {
+    switch ($_.OS) {
+      Windows { $true }
+      Android { $Android }
+      default { $false }
+    }
+  } | ForEach-Object {
+    Invoke-BuildStep Build-CompilerRuntime $_
+  }
 
   # Build Macros
   Build-CMakeProject `
