Skip to content

Commit 9ae142c

Browse files
authored
Merge pull request swiftlang#81724 from compnerd/settings
utils: flesh out SDKSettings.json further on Windows
2 parents d816f0f + 77fdaa9 commit 9ae142c

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

utils/build.ps1

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,7 +2282,7 @@ function Build-ExperimentalRuntime {
22822282
}
22832283
}
22842284

2285-
function Write-SDKSettingsPlist([OS] $OS) {
2285+
function Write-SDKSettings([OS] $OS) {
22862286
$SDKSettings = @{
22872287
DefaultProperties = @{
22882288
}
@@ -2293,11 +2293,14 @@ function Write-SDKSettingsPlist([OS] $OS) {
22932293
Write-PList -Settings $SDKSettings -Path "$(Get-SwiftSDK $OS)\SDKSettings.plist"
22942294

22952295
$SDKSettings = @{
2296-
CanonicalName = $OS.ToString()
2296+
CanonicalName = $OS.ToString().ToLowerInvariant()
22972297
DisplayName = $OS.ToString()
2298-
IsBaseSDK = "NO"
2298+
IsBaseSDK = "YES"
22992299
Version = "${ProductVersion}"
23002300
VersionMap = @{}
2301+
HeaderSearchPaths = @( "usr/include" );
2302+
LibrarySearchPaths = @();
2303+
Toolchains = @( "${ToolchainIdentifier}" );
23012304
DefaultProperties = @{
23022305
PLATFORM_NAME = $OS.ToString()
23032306
DEFAULT_COMPILER = "${ToolchainIdentifier}"
@@ -3230,7 +3233,7 @@ if (-not $SkipBuild) {
32303233

32313234
Install-Platform $WindowsSDKPlatforms Windows
32323235
Write-PlatformInfoPlist Windows
3233-
Write-SDKSettingsPlist Windows
3236+
Write-SDKSettings Windows
32343237

32353238
if ($Android) {
32363239
foreach ($Platform in $AndroidSDKPlatforms) {
@@ -3245,7 +3248,7 @@ if (-not $SkipBuild) {
32453248

32463249
Install-Platform $AndroidSDKPlatforms Android
32473250
Write-PlatformInfoPlist Android
3248-
Write-SDKSettingsPlist Android
3251+
Write-SDKSettings Android
32493252

32503253
# Android swift-inspect only supports 64-bit platforms.
32513254
$AndroidSDKPlatforms | Where-Object { @("arm64-v8a", "x86_64") -contains $_.Architecture.ABI } | ForEach-Object {

0 commit comments

Comments
 (0)