Skip to content

build.ps1: isolate bootstrapping macros #84163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2025
Merged

build.ps1: isolate bootstrapping macros #84163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,8 @@ function Invoke-BuildStep {
enum Project {
BuildTools
RegsGen2
BootstrapFoundationMacros
BootstrapTestingMacros

CDispatch
Compilers
Expand Down Expand Up @@ -2975,7 +2977,7 @@ function Build-Foundation {
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform FoundationMacros)\bin"
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapFoundationMacros)\bin"
}
}

Expand Down Expand Up @@ -3084,7 +3086,7 @@ function Build-Testing([Hashtable] $Platform) {
CMAKE_INSTALL_BINDIR = $Platform.BinaryDir;
dispatch_DIR = (Get-ProjectCMakeModules $Platform Dispatch);
Foundation_DIR = (Get-ProjectCMakeModules $Platform DynamicFoundation);
SwiftTesting_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform TestingMacros)\TestingMacros.dll";
SwiftTesting_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapTestingMacros)\TestingMacros.dll";
SwiftTesting_INSTALL_NESTED_SUBDIR = "YES";
}
}
Expand Down Expand Up @@ -3135,7 +3137,7 @@ function Install-SDK([Hashtable[]] $Platforms, [OS] $OS = $Platforms[0].OS, [str
}
}

function Build-SDK([Hashtable] $Platform, [switch] $IncludeMacros = $false) {
function Build-SDK([Hashtable] $Platform) {
if ($IncludeDS2) {
Invoke-BuildStep Build-DS2 $Platform
}
Expand All @@ -3149,10 +3151,6 @@ function Build-SDK([Hashtable] $Platform, [switch] $IncludeMacros = $false) {
# Libraries
Invoke-BuildStep Build-Runtime $Platform
Invoke-BuildStep Build-Dispatch $Platform
if ($IncludeMacros) {
Invoke-BuildStep Build-FoundationMacros $Platform
Invoke-BuildStep Build-TestingMacros $Platform
}
Invoke-BuildStep Build-Foundation $Platform
Invoke-BuildStep Build-Sanitizers $Platform
Invoke-BuildStep Build-XCTest $Platform
Expand Down Expand Up @@ -3229,7 +3227,7 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform FoundationMacros)\bin"
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapFoundationMacros)\bin"
}

Build-CMakeProject `
Expand Down Expand Up @@ -3261,7 +3259,7 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform FoundationMacros)\bin"
SwiftFoundation_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapFoundationMacros)\bin"
}
}

Expand Down Expand Up @@ -3959,7 +3957,28 @@ if (-not $SkipBuild) {
Invoke-BuildStep Build-CDispatch $HostPlatform
Invoke-BuildStep Build-Compilers $HostPlatform -Variant "Asserts"

Invoke-BuildStep Build-SDK $BuildPlatform -IncludeMacros
# Build Macros
Build-CMakeProject `
-Src $SourceCache\swift-foundation\Sources\FoundationMacros `
-Bin (Get-ProjectBinaryCache $BuildPlatform BootstrapFoundationMacros) `
-BuildTargets default `
-Platform $BuildPlatform `
-UsePinnedCompilers Swift `
-SwiftSDK (Get-PinnedToolchainSDK -OS $BuildPlatform.OS) `
-Defines @{
SwiftSyntax_DIR = (Get-ProjectCMakeModules $BuildPlatform Compilers);
}

Build-CMakeProject `
-Src $SourceCache\swift-testing\Sources\TestingMacros `
-Bin (Get-ProjectBinaryCache $BuildPlatform BootstrapTestingMacros) `
-BuildTargets default `
-Platform $BuildPlatform `
-UsePinnedCompilers Swift `
-SwiftSDK (Get-PinnedToolchainSDK -OS $BuildPlatform.OS) `
-Defines @{
SwiftSyntax_DIR = (Get-ProjectCMakeModules $BuildPlatform Compilers);
}

foreach ($SDK in $WindowsSDKVersions) {
switch ($SDK) {
Expand Down