Skip to content

Add --destination option for cross-compiled projects #330

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

Closed
wants to merge 1 commit into from
Closed

Add --destination option for cross-compiled projects #330

Show file tree
Hide file tree
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
19 changes: 13 additions & 6 deletions Sources/SKCore/BuildSetup.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,15 @@
//
//===----------------------------------------------------------------------===//

import SKSupport
import TSCBasic
import TSCUtility
import SKSupport

/// Build configuration
public struct BuildSetup {

/// Default configuration
public static let `default` = BuildSetup(configuration: .debug,
path: nil,
flags: BuildFlags())
public static let `default` =
BuildSetup(configuration: .debug, path: nil, destinationFile: nil, flags: BuildFlags())

/// Build configuration (debug|release).
public var configuration: BuildConfiguration
Expand All @@ -31,9 +29,18 @@ public struct BuildSetup {
/// Additional build flags
public var flags: BuildFlags

public init(configuration: BuildConfiguration, path: AbsolutePath?, flags: BuildFlags) {
/// Path to the destination.json file that describes build destination settings
public var destinationFile: AbsolutePath?

public init(
configuration: BuildConfiguration,
path: AbsolutePath?,
destinationFile: AbsolutePath? = nil,
flags: BuildFlags
) {
self.configuration = configuration
self.path = path
self.destinationFile = destinationFile
self.flags = flags
}
}
8 changes: 7 additions & 1 deletion Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,13 @@ public final class SwiftPMWorkspace {
throw Error.cannotDetermineHostToolchain
}

let destination = try Destination.hostDestination(destinationToolchainBinDir)
let destination: Destination
if let destinationFile = buildSetup.destinationFile {
destination = try Destination(fromFile: destinationFile)
} else {
destination = try Destination.hostDestination(destinationToolchainBinDir)
}

let toolchain = try UserToolchain(destination: destination)

let buildPath: AbsolutePath = buildSetup.path ?? packageRoot.appending(component: ".build")
Expand Down
6 changes: 6 additions & 0 deletions Sources/sourcekit-lsp/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,17 @@ struct Main: ParsableCommand {
)
var completionMaxResults = 200

@Option(
help: "Path to the destination.json file that describes build destination settings"
)
var destination: AbsolutePath?

func mapOptions() -> SourceKitServer.Options {
var serverOptions = SourceKitServer.Options()

serverOptions.buildSetup.configuration = buildConfiguration
serverOptions.buildSetup.path = buildPath
serverOptions.buildSetup.destinationFile = destination
serverOptions.buildSetup.flags.cCompilerFlags = buildFlagsCc
serverOptions.buildSetup.flags.cxxCompilerFlags = buildFlagsCxx
serverOptions.buildSetup.flags.linkerFlags = buildFlagsLinker
Expand Down