Skip to content

Commit 76a2ba1

Browse files
hyphyp
committed
rename Get-HostSwiftSDK to Get-BuildSwiftSDK during build.ps1
1 parent 6381a77 commit 76a2ba1

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

‎utils/build.ps1

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ function Get-InstallDir($Arch) {
334334
return "$ImageRoot\$ProgramFilesName\Swift"
335335
}
336336

337-
function Get-HostSwiftSDK() {
337+
function Get-BuildSwiftSDK() {
338338
return ([IO.Path]::Combine((Get-InstallDir $HostArch), "Platforms", "Windows.platform", "Developer", "SDKs", "Windows.sdk"))
339339
}
340340

@@ -1858,7 +1858,7 @@ function Build-System($Arch) {
18581858
-Arch $Arch `
18591859
-Platform Windows `
18601860
-UseBuiltCompilers C,Swift `
1861-
-SwiftSDK (Get-HostSwiftSDK) `
1861+
-SwiftSDK (Get-BuildSwiftSDK) `
18621862
-BuildTargets default `
18631863
-Defines @{
18641864
BUILD_SHARED_LIBS = "YES";
@@ -1878,7 +1878,7 @@ function Build-ToolsSupportCore($Arch) {
18781878
-Arch $Arch `
18791879
-Platform Windows `
18801880
-UseBuiltCompilers C,Swift `
1881-
-SwiftSDK (Get-HostSwiftSDK) `
1881+
-SwiftSDK (Get-BuildSwiftSDK) `
18821882
-BuildTargets default `
18831883
-Defines @{
18841884
BUILD_SHARED_LIBS = "YES";
@@ -1916,7 +1916,7 @@ function Build-LLBuild($Arch, [switch]$Test = $false) {
19161916
-Platform Windows `
19171917
-UseMSVCCompilers CXX `
19181918
-UseBuiltCompilers Swift `
1919-
-SwiftSDK (Get-HostSwiftSDK) `
1919+
-SwiftSDK (Get-BuildSwiftSDK) `
19201920
-BuildTargets $Targets `
19211921
-Defines ($TestingDefines + @{
19221922
BUILD_SHARED_LIBS = "YES";
@@ -1934,7 +1934,7 @@ function Build-Yams($Arch) {
19341934
-Arch $Arch `
19351935
-Platform Windows `
19361936
-UseBuiltCompilers C,Swift `
1937-
-SwiftSDK (Get-HostSwiftSDK) `
1937+
-SwiftSDK (Get-BuildSwiftSDK) `
19381938
-BuildTargets default `
19391939
-Defines @{
19401940
BUILD_SHARED_LIBS = "NO";
@@ -1950,7 +1950,7 @@ function Build-ArgumentParser($Arch) {
19501950
-Arch $Arch `
19511951
-Platform Windows `
19521952
-UseBuiltCompilers Swift `
1953-
-SwiftSDK (Get-HostSwiftSDK) `
1953+
-SwiftSDK (Get-BuildSwiftSDK) `
19541954
-BuildTargets default `
19551955
-Defines @{
19561956
BUILD_SHARED_LIBS = "YES";
@@ -1966,7 +1966,7 @@ function Build-Driver($Arch) {
19661966
-Arch $Arch `
19671967
-Platform Windows `
19681968
-UseBuiltCompilers C,CXX,Swift `
1969-
-SwiftSDK (Get-HostSwiftSDK) `
1969+
-SwiftSDK (Get-BuildSwiftSDK) `
19701970
-BuildTargets default `
19711971
-Defines @{
19721972
BUILD_SHARED_LIBS = "YES";
@@ -1992,7 +1992,7 @@ function Build-Crypto($Arch) {
19921992
-Arch $Arch `
19931993
-Platform Windows `
19941994
-UseBuiltCompilers Swift `
1995-
-SwiftSDK (Get-HostSwiftSDK) `
1995+
-SwiftSDK (Get-BuildSwiftSDK) `
19961996
-BuildTargets default `
19971997
-Defines @{
19981998
BUILD_SHARED_LIBS = "NO";
@@ -2007,7 +2007,7 @@ function Build-Collections($Arch) {
20072007
-Arch $Arch `
20082008
-Platform Windows `
20092009
-UseBuiltCompilers C,Swift `
2010-
-SwiftSDK (Get-HostSwiftSDK) `
2010+
-SwiftSDK (Get-BuildSwiftSDK) `
20112011
-BuildTargets default `
20122012
-Defines @{
20132013
BUILD_SHARED_LIBS = "YES";
@@ -2020,7 +2020,7 @@ function Build-ASN1($Arch) {
20202020
-Bin (Get-HostProjectBinaryCache ASN1) `
20212021
-Arch $Arch `
20222022
-UseBuiltCompilers C,Swift `
2023-
-SwiftSDK (Get-HostSwiftSDK) `
2023+
-SwiftSDK (Get-BuildSwiftSDK) `
20242024
-BuildTargets default `
20252025
-Defines @{
20262026
BUILD_SHARED_LIBS = "NO";
@@ -2034,7 +2034,7 @@ function Build-Certificates($Arch) {
20342034
-Arch $Arch `
20352035
-Platform Windows `
20362036
-UseBuiltCompilers Swift `
2037-
-SwiftSDK (Get-HostSwiftSDK) `
2037+
-SwiftSDK (Get-BuildSwiftSDK) `
20382038
-BuildTargets default `
20392039
-Defines @{
20402040
BUILD_SHARED_LIBS = "NO";
@@ -2057,7 +2057,7 @@ function Build-PackageManager($Arch) {
20572057
-Arch $Arch `
20582058
-Platform Windows `
20592059
-UseBuiltCompilers C,Swift `
2060-
-SwiftSDK (Get-HostSwiftSDK) `
2060+
-SwiftSDK (Get-BuildSwiftSDK) `
20612061
-BuildTargets default `
20622062
-Defines @{
20632063
BUILD_SHARED_LIBS = "YES";
@@ -2085,7 +2085,7 @@ function Build-Markdown($Arch) {
20852085
-Arch $Arch `
20862086
-Platform Windows `
20872087
-UseBuiltCompilers C,Swift `
2088-
-SwiftSDK (Get-HostSwiftSDK) `
2088+
-SwiftSDK (Get-BuildSwiftSDK) `
20892089
-BuildTargets default `
20902090
-Defines @{
20912091
BUILD_SHARED_LIBS = "NO";
@@ -2103,7 +2103,7 @@ function Build-Format($Arch) {
21032103
-Platform Windows `
21042104
-UseMSVCCompilers C `
21052105
-UseBuiltCompilers Swift `
2106-
-SwiftSDK (Get-HostSwiftSDK) `
2106+
-SwiftSDK (Get-BuildSwiftSDK) `
21072107
-BuildTargets default `
21082108
-Defines @{
21092109
BUILD_SHARED_LIBS = "YES";
@@ -2115,7 +2115,7 @@ function Build-Format($Arch) {
21152115
}
21162116

21172117
function Build-IndexStoreDB($Arch) {
2118-
$SDKInstallRoot = (Get-HostSwiftSDK);
2118+
$SDKInstallRoot = (Get-BuildSwiftSDK);
21192119

21202120
Build-CMakeProject `
21212121
-Src $SourceCache\indexstore-db `
@@ -2140,7 +2140,7 @@ function Build-SourceKitLSP($Arch) {
21402140
-Arch $Arch `
21412141
-Platform Windows `
21422142
-UseBuiltCompilers C,Swift `
2143-
-SwiftSDK (Get-HostSwiftSDK) `
2143+
-SwiftSDK (Get-BuildSwiftSDK) `
21442144
-BuildTargets default `
21452145
-Defines @{
21462146
SwiftSyntax_DIR = (Get-HostProjectCMakeModules Compilers);
@@ -2177,7 +2177,7 @@ function Install-HostToolchain() {
21772177

21782178
function Build-Inspect() {
21792179
$OutDir = Join-Path -Path $HostArch.BinaryCache -ChildPath swift-inspect
2180-
$SDKInstallRoot = (Get-HostSwiftSDK) `
2180+
$SDKInstallRoot = (Get-BuildSwiftSDK) `
21812181

21822182
Isolate-EnvVars {
21832183
$env:SWIFTCI_USE_LOCAL_DEPS=1

0 commit comments

Comments
 (0)