@@ -4080,38 +4080,13 @@ function Build-Inspect([Hashtable] $Platform) {
40804080 }
40814081}
40824082
4083- function Build-SymbolKit ([hashtable ] $Platform ) {
4084- Build-CMakeProject `
4085- - Src $SourceCache \swift- docc- symbolkit `
4086- - Bin $ (Get-ProjectBinaryCache $Platform SymbolKit) `
4087- - BuildTargets default `
4088- - Platform $Platform `
4089- - UseBuiltCompilers C, Swift `
4090- - SwiftSDK (Get-SwiftSDK - OS $Platform.OS - Identifier $Platform.DefaultSDK ) `
4091- - Defines @ {
4092- CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
4093- }
4094- }
4095-
4096- function Build-DocC ([hashtable ] $Platform ) {
4097- Build-CMakeProject `
4083+ function Build-DocC () {
4084+ Build-SPMProject `
4085+ - Action Build `
40984086 - Src $SourceCache \swift- docc `
4099- - Bin (Get-ProjectBinaryCache $BuildPlatform DocC) `
4100- - InstallTo " $ ( $Platform.ToolchainInstallRoot ) \usr" `
4101- - Platform $Platform `
4102- - UseBuiltCompilers C, Swift `
4103- - SwiftSDK (Get-SwiftSDK - OS $Platform.OS - Identifier $Platform.DefaultSDK ) `
4104- - Defines @ {
4105- BUILD_SHARED_LIBS = " YES" ;
4106- CMAKE_STATIC_LIBRARY_PREFIX_Swift = " lib" ;
4107- ArgumentParser_DIR = (Get-ProjectCMakeModules $Platform ArgumentParser);
4108- SwiftASN1_DIR = (Get-ProjectCMakeModules $Platform ASN1);
4109- SwiftCrypto_DIR = (Get-ProjectCMakeModules $Platform Crypto);
4110- SwiftMarkdown_DIR = (Get-ProjectCMakeModules $Platform Markdown);
4111- LMDB_DIR = (Get-ProjectCMakeModules $Platform LMDB);
4112- SymbolKit_DIR = (Get-ProjectCMakeModules $Platform SymbolKit);
4113- " cmark-gfm_DIR" = " $ ( $Platform.ToolchainInstallRoot ) \usr\lib\cmake" ;
4114- }
4087+ - Bin $ (Get-ProjectBinaryCache $BuildPlatform DocC) `
4088+ - Platform $BuildPlatform `
4089+ -- product docc
41154090}
41164091
41174092function Test-PackageManager () {
@@ -4486,8 +4461,7 @@ if (-not $SkipBuild -and $IncludeNoAsserts) {
44864461 Build-NoAssertsToolchain
44874462}
44884463
4489- if (-not $SkipBuild ) {
4490- Invoke-BuildStep Build-SymbolKit $HostPlatform
4464+ if (-not $SkipBuild -and -not $IsCrossCompiling ) {
44914465 Invoke-BuildStep Build-DocC $HostPlatform
44924466}
44934467
0 commit comments