Skip to content

Commit 6c20199

Browse files
authored
Merge pull request #840 from nkcsgexi/forgiving-platform-kind
Be forgiving for malformed SDK info file. NFC
2 parents ec1d529 + 083e93d commit 6c20199

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Sources/SwiftDriver/Jobs/PrebuiltModulesJob.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ public struct SDKPrebuiltModuleInputsCollector {
249249
return "arm64-apple-tvos\(version)"
250250
case .appletvsimulator:
251251
return "arm64-apple-tvos\(version)-simulator"
252+
case .unknown:
253+
fatalError("unknown platform kind")
252254
}
253255
}
254256

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ public final class DarwinToolchain: Toolchain {
248248
case watchsimulator
249249
case appletvos
250250
case appletvsimulator
251+
case unknown
251252
}
252253

253254
struct VersionMap: Decodable {
@@ -289,7 +290,7 @@ public final class DarwinToolchain: Toolchain {
289290
self.versionString = try keyedContainer.decode(String.self, forKey: .version)
290291
self.canonicalName = try keyedContainer.decode(String.self, forKey: .canonicalName)
291292
let verRange = canonicalName.range(of: versionString)!
292-
self.platformKind = SDKPlatformKind(rawValue: String(canonicalName[..<verRange.lowerBound]))!
293+
self.platformKind = SDKPlatformKind(rawValue: String(canonicalName[..<verRange.lowerBound])) ?? SDKPlatformKind.unknown
293294
guard let version = try? Version(versionString: versionString, usesLenientParsing: true) else {
294295
throw DecodingError.dataCorruptedError(forKey: .version,
295296
in: keyedContainer,

0 commit comments

Comments
 (0)