From 6fc7e58625fe42c193b8f0d7a7bfbb069feb59bc Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 9 Sep 2025 15:02:42 -0700 Subject: [PATCH] build.ps1: hoist `Build-CompilerRuntimes` out of `Build-SDK` This builds the compiler runtime (builtins) and the sanitizers. These are part of the toolchain distribution rather than the SDK. Shuffle the build around to further thin out `Build-SDK`. --- utils/build.ps1 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/utils/build.ps1 b/utils/build.ps1 index 0c49a2e800076..3208a4a8cfb82 100644 --- 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 `