Skip to content

Commit 8909190

Browse files
authored
Merge pull request #80609 from compnerd/case
utils: adjust the emission of `SDKSettings.json`. Use lowercase spellings for the platform names to match SwiftBuild's expectations as pointed out by @jakepetroules.
2 parents 4d86bdf + 5d5fff9 commit 8909190

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

utils/build.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2317,7 +2317,7 @@ function Write-SDKSettingsPlist([OS] $OS) {
23172317
DEFAULT_COMPILER = "${ToolchainIdentifier}"
23182318
}
23192319
SupportedTargets = @{
2320-
$OS.ToString() = @{
2320+
$OS.ToString().ToLowerInvariant() = @{
23212321
PlatformFamilyDisplayName = $OS.ToString()
23222322
PlatformFamilyName = $OS.ToString()
23232323
}
@@ -2326,16 +2326,16 @@ function Write-SDKSettingsPlist([OS] $OS) {
23262326
switch ($OS) {
23272327
Windows {
23282328
$SDKSettings.DefaultProperties.DEFAULT_USE_RUNTIME = "MD"
2329-
$SDKSettings.SupportedTargets.Windows.LLVMTargetVendor = "unknown"
2330-
$SDKSettings.SupportedTargets.Windows.LLVMTargetSys = "windows"
2331-
$SDKSettings.SupportedTargets.Windows.LLVMTargetTripleEnvironment = "msvc"
2332-
$SDKSettings.SupportedTargets.Windows.Archs = $WindowsSDKPlatforms | ForEach-Object { $_.Architecture.LLVMName } | Sort-Object
2329+
$SDKSettings.SupportedTargets.windows.LLVMTargetVendor = "unknown"
2330+
$SDKSettings.SupportedTargets.windows.LLVMTargetSys = "windows"
2331+
$SDKSettings.SupportedTargets.windows.LLVMTargetTripleEnvironment = "msvc"
2332+
$SDKSettings.SupportedTargets.windows.Archs = $WindowsSDKPlatforms | ForEach-Object { $_.Architecture.LLVMName } | Sort-Object
23332333
}
23342334
Android {
2335-
$SDKSettings.SupportedTargets.Android.LLVMTargetVendor = "unknown"
2336-
$SDKSettings.SupportedTargets.Android.LLVMTargetSys = "linux"
2337-
$SDKSettings.SupportedTargets.Android.LLVMTargetTripleEnvironment = "android${AndroidAPILevel}"
2338-
$SDKSettings.SupportedTargets.Android.Archs = $AndroidSDKPlatforms | ForEach-Object { $_.Architecture.LLVMName } | Sort-Object
2335+
$SDKSettings.SupportedTargets.android.LLVMTargetVendor = "unknown"
2336+
$SDKSettings.SupportedTargets.android.LLVMTargetSys = "linux"
2337+
$SDKSettings.SupportedTargets.android.LLVMTargetTripleEnvironment = "android${AndroidAPILevel}"
2338+
$SDKSettings.SupportedTargets.android.Archs = $AndroidSDKPlatforms | ForEach-Object { $_.Architecture.LLVMName } | Sort-Object
23392339
}
23402340
}
23412341
$SDKSettings | ConvertTo-JSON -Depth 4 | Out-FIle -FilePath "$(Get-SwiftSDK $OS)\SDKSettings.json"

0 commit comments

Comments
 (0)