utils: build Foundation macros for distribution

This adds a build of the Foundation macros for distribution in the
toolchain.

Author: compnerd

utils/build.ps1

@@ -395,7 +395,8 @@ function Get-TargetProjectBinaryCache($Arch, [TargetComponent]$Project) {
 
 enum HostComponent {
   Compilers = 5
-  System = 10
+  FoundationMacros = 10
+  System
   ToolsSupportCore
   LLBuild
   Yams
@@ -1664,7 +1665,6 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
     }
   } else {
     $DispatchBinaryCache = Get-TargetProjectBinaryCache $Arch Dispatch
-    $SwiftSyntaxDir = Get-HostProjectCMakeModules Compilers
     $FoundationBinaryCache = Get-TargetProjectBinaryCache $Arch Foundation
     $ShortArch = $Arch.LLVMName
 
@@ -1673,12 +1673,6 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
       $Targets = @("default")
       $InstallPath = "$($Arch.SDKInstallRoot)\usr"
 
-      if ($Platform -eq "Android") {
-        $HostDefines = @{ CMAKE_HOST_Swift_FLAGS = "-sdk `"$($HostArch.SDKInstallRoot)`"" }
-      } else {
-        $HostDefines = @{}
-      }
-
       Build-CMakeProject `
         -Src $SourceCache\swift-corelibs-foundation `
         -Bin $FoundationBinaryCache `
@@ -1688,6 +1682,7 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
         -UseBuiltCompilers ASM,C,CXX,Swift `
         -BuildTargets $Targets `
         -Defines (@{
+          CMAKE_HOST_Swift_FLAGS = "-sdk `"$($HostArch.SDKInstallRoot)`"";
           FOUNDATION_BUILD_TOOLS = if ($Platform -eq "Windows") { "YES" } else { "NO" };
           CURL_DIR = "$LibraryRoot\curl-8.5.0\usr\lib\$Platform\$ShortArch\cmake\CURL";
           LIBXML2_LIBRARY = if ($Platform -eq "Windows") {
@@ -1704,15 +1699,29 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
           };
           ZLIB_INCLUDE_DIR = "$LibraryRoot\zlib-1.3.1\usr\include";
           dispatch_DIR = "$DispatchBinaryCache\cmake\modules";
-          SwiftSyntax_DIR = "$SwiftSyntaxDir";
+          SwiftSyntax_DIR = (Get-HostProjectCMakeModules Compilers);
           _SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
           _SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
-          _SwiftCollections_SourceDIR = "$SourceCache\swift-collections"
-        } + $HostDefines + $TestingDefines)
+          _SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
+        } + $TestingDefines)
     }
   }
 }
 
+function Build-FoundationMacros([Platform]$Platform, $Arch) {
+  Build-CMakeProject `
+    -Src $SourceCache\swift-foundation\Sources\FoundationMacros `
+    -Bin (Get-HostProjectBinaryCache FoundationMacros) `
+    -InstallTo "$($Arch.ToolchainInstallRoot)\usr" `
+    -Arch $Arch `
+    -Platform $Platform `
+    -UseBuiltCompilers Swift `
+    -BuildTargets @("default", "install") `
+    -Defines @{
+      SwiftSyntax_DIR = (Get-HostProjectCMakeModules Compilers);
+    }
+}
+
 function Build-XCTest([Platform]$Platform, $Arch, [switch]$Test = $false) {
   $DispatchBinaryCache = Get-TargetProjectBinaryCache $Arch Dispatch
   $FoundationBinaryCache = Get-TargetProjectBinaryCache $Arch Foundation
@@ -2378,6 +2387,9 @@ if (-not $ToBatch) {
 }
 
 if (-not $SkipBuild) {
+  # Build Macros for distribution
+  Invoke-BuildStep Build-FoundationMacros Windows $HostArch
+
   Invoke-BuildStep Build-SQLite $HostArch
   Invoke-BuildStep Build-System $HostArch
   Invoke-BuildStep Build-ToolsSupportCore $HostArch