Skip to content

[Integrated Swift driver] Pass along the Swift location. #2764

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
May 23, 2020
Merged

[Integrated Swift driver] Pass along the Swift location. #2764

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
13 changes: 6 additions & 7 deletions Sources/Build/ManifestBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,29 +200,28 @@ extension LLBuildManifestBuilder {
do {
// Use the integrated Swift driver to compute the set of frontend
// jobs needed to build this Swift target.
var driver = try Driver(args: target.emitCommandLine(), fileSystem: target.fs)
var commandLine = target.emitCommandLine();
commandLine.append("-driver-use-frontend-path")
commandLine.append(buildParameters.toolchain.swiftCompiler.pathString)
var driver = try Driver(args: commandLine, fileSystem: target.fs)
let jobs = try driver.planBuild()
let resolver = try ArgsResolver(fileSystem: target.fs)

for job in jobs {
// Figure out which tool we are using.
// FIXME: This feels like a hack.
let datool: String
let tool = try resolver.resolve(.path(job.tool))
let isSwiftFrontend: Bool
switch job.kind {
case .compile, .mergeModule, .emitModule, .generatePCH,
.generatePCM, .interpret, .repl, .printTargetInfo,
.versionRequest, .backend:
datool = buildParameters.toolchain.swiftCompiler.pathString
isSwiftFrontend = true

case .autolinkExtract, .generateDSYM, .help, .link, .verifyDebugInfo:
datool = try resolver.resolve(.path(job.tool))
isSwiftFrontend = false
}

let commandLine = try job.commandLine.map{ try resolver.resolve($0) }
let arguments = [datool] + commandLine
let arguments = [tool] + commandLine

let jobInputs = job.inputs.map { $0.resolveToNode() }
let jobOutputs = job.outputs.map { $0.resolveToNode() }
Expand Down