diff --git a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift index 7b5b0fe78..303d68bb6 100644 --- a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift +++ b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift @@ -289,8 +289,8 @@ public final class DarwinToolchain: Toolchain { case watchsimulator case appletvos case appletvsimulator - case visionos - case visionsimulator + case visionos = "xros" + case visionsimulator = "xrsimulator" case unknown } diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift index f3c09affb..64f076f25 100644 --- a/Tests/SwiftDriverTests/SwiftDriverTests.swift +++ b/Tests/SwiftDriverTests/SwiftDriverTests.swift @@ -4466,6 +4466,27 @@ final class SwiftDriverTests: XCTestCase { } } + func testDarwinSDKToolchainName() throws { + var envVars = ProcessEnv.vars + envVars["SWIFT_DRIVER_LD_EXEC"] = ld.nativePathString(escaped: false) + + try withTemporaryDirectory { tmpDir in + let sdk = tmpDir.appending(component: "XROS1.0.sdk") + try localFileSystem.createDirectory(sdk, recursive: true) + try localFileSystem.writeFileContents(sdk.appending(component: "SDKSettings.json"), bytes: + """ + { + "Version":"1.0", + "CanonicalName": "xros1.0" + } + """ + ) + + let sdkInfo = DarwinToolchain.readSDKInfo(localFileSystem, VirtualPath.absolute(sdk).intern()) + XCTAssertEqual(sdkInfo?.platformKind, .visionos) + } + } + // Test cases ported from Driver/macabi-environment.swift func testDarwinSDKVersioning() throws { var envVars = ProcessEnv.vars