Skip to content

Commit 6fc7e58

Browse files
committed
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`.
1 parent a71336c commit 6fc7e58

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

utils/build.ps1

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2333,7 +2333,7 @@ function Build-LLVM([Hashtable] $Platform) {
23332333
}
23342334

23352335
function Build-CompilerRuntime([Hashtable] $Platform) {
2336-
$LLVMBinaryCache = $(Get-ProjectBinaryCache $Platform LLVM)
2336+
$LLVMBinaryCache = $(Get-ProjectBinaryCache $HostPlatform Compilers)
23372337

23382338
$LITVersionStr = $(Invoke-Program $(Get-PythonExecutable) "$LLVMBinaryCache\bin\llvm-lit.py" --version)
23392339
if (-not $ToBatch -and -not ($LITVersionStr -match "lit (\d+)\.\d+\.\d+.*")) {
@@ -3920,6 +3920,15 @@ if (-not $SkipBuild) {
39203920
Invoke-BuildStep Build-XML2 $HostPlatform
39213921
Invoke-BuildStep Build-CDispatch $HostPlatform
39223922
Invoke-BuildStep Build-Compilers $HostPlatform -Variant "Asserts"
3923+
$KnownPlatforms.Values | Where-Object {
3924+
switch ($_.OS) {
3925+
Windows { $true }
3926+
Android { $Android }
3927+
default { $false }
3928+
}
3929+
} | ForEach-Object {
3930+
Invoke-BuildStep Build-CompilerRuntime $_
3931+
}
39233932

39243933
# Build Macros
39253934
Build-CMakeProject `

0 commit comments

Comments
 (0)