Skip to content

[NFC] Use SwiftSDK instead of deprecated Destination #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2023
Merged

[NFC] Use SwiftSDK instead of deprecated Destination #773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ public final class SwiftPMWorkspace {
throw Error.cannotDetermineHostToolchain
}

let destination = try Destination.hostDestination(AbsolutePath(destinationToolchainBinDir))
let toolchain = try UserToolchain(destination: destination)
let swiftSDK = try SwiftSDK.hostSwiftSDK(AbsolutePath(destinationToolchainBinDir))
let toolchain = try UserToolchain(swiftSDK: swiftSDK)

var location = try Workspace.Location(
forRootPackage: AbsolutePath(packageRoot),
Expand All @@ -139,8 +139,6 @@ public final class SwiftPMWorkspace {
configuration: configuration,
customHostToolchain: toolchain)

let triple = toolchain.triple

let buildConfiguration: PackageModel.BuildConfiguration
switch buildSetup.configuration {
case .debug:
Expand All @@ -150,7 +148,7 @@ public final class SwiftPMWorkspace {
}

self.buildParameters = try BuildParameters(
dataPath: location.scratchDirectory.appending(component: triple.platformBuildPathComponent()),
dataPath: location.scratchDirectory.appending(component: toolchain.targetTriple.platformBuildPathComponent()),
configuration: buildConfiguration,
toolchain: toolchain,
flags: buildSetup.flags
Expand Down