Skip to content

Commit 6524012

Browse files
authored
Merge pull request #78720 from compnerd/unsystematic
utils: convert SystemPackage to static linkage
2 parents d98de54 + 7a8cc95 commit 6524012

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

utils/build.ps1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,6 @@ enum HostComponent {
433433
Compilers = 5
434434
FoundationMacros = 10
435435
TestingMacros
436-
System
437436
ToolsSupportCore
438437
LLBuild
439438
Yams
@@ -443,6 +442,7 @@ enum HostComponent {
443442
Collections
444443
ASN1
445444
Certificates
445+
System
446446
PackageManager
447447
Markdown
448448
Format
@@ -2209,7 +2209,6 @@ function Build-ToolsSupportCore($Arch) {
22092209
-SwiftSDK (Get-HostSwiftSDK) `
22102210
-Defines @{
22112211
BUILD_SHARED_LIBS = "YES";
2212-
SwiftSystem_DIR = (Get-HostProjectCMakeModules System);
22132212
}
22142213
}
22152214

@@ -2297,7 +2296,6 @@ function Build-Driver($Arch) {
22972296
-SwiftSDK (Get-HostSwiftSDK) `
22982297
-Defines @{
22992298
BUILD_SHARED_LIBS = "YES";
2300-
SwiftSystem_DIR = (Get-HostProjectCMakeModules System);
23012299
TSC_DIR = (Get-HostProjectCMakeModules ToolsSupportCore);
23022300
LLBuild_DIR = (Get-HostProjectCMakeModules LLBuild);
23032301
Yams_DIR = (Get-HostProjectCMakeModules Yams);
@@ -2513,7 +2511,6 @@ function Build-SourceKitLSP($Arch) {
25132511
-SwiftSDK (Get-HostSwiftSDK) `
25142512
-Defines @{
25152513
SwiftSyntax_DIR = (Get-HostProjectCMakeModules Compilers);
2516-
SwiftSystem_DIR = (Get-HostProjectCMakeModules System);
25172514
TSC_DIR = (Get-HostProjectCMakeModules ToolsSupportCore);
25182515
LLBuild_DIR = (Get-HostProjectCMakeModules LLBuild);
25192516
ArgumentParser_DIR = (Get-HostProjectCMakeModules ArgumentParser);
@@ -2881,7 +2878,6 @@ if (-not $ToBatch) {
28812878

28822879
if (-not $SkipBuild) {
28832880
Invoke-BuildStep Build-SQLite $HostArch
2884-
Invoke-BuildStep Build-System $HostArch
28852881
Invoke-BuildStep Build-ToolsSupportCore $HostArch
28862882
Invoke-BuildStep Build-LLBuild $HostArch
28872883
Invoke-BuildStep Build-Yams $HostArch
@@ -2891,6 +2887,7 @@ if (-not $SkipBuild) {
28912887
Invoke-BuildStep Build-Collections $HostArch
28922888
Invoke-BuildStep Build-ASN1 $HostArch
28932889
Invoke-BuildStep Build-Certificates $HostArch
2890+
Invoke-BuildStep Build-System $HostArch
28942891
Invoke-BuildStep Build-PackageManager $HostArch
28952892
Invoke-BuildStep Build-Markdown $HostArch
28962893
Invoke-BuildStep Build-Format $HostArch

0 commit comments

Comments
 (0)