Skip to content

Fix up self-discovery of Swift Driver and tools #1067

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 3 commits into from
Sep 19, 2022
Merged

Fix up self-discovery of Swift Driver and tools #1067

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0de0af
Fix looking up for self (the driver executable)
stevapple Apr 20, 2022
f207c2a
Pass full path to subcommand executable
stevapple Apr 20, 2022
0c4c300
Merge branch 'main' into find-subcommand
stevapple Aug 2, 2022
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
11 changes: 8 additions & 3 deletions Sources/swift-driver/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,20 @@ do {
if case .subcommand(let subcommand) = mode {
// We are running as a subcommand, try to find the subcommand adjacent to the executable we are running as.
// If we didn't find the tool there, let the OS search for it.
let subcommandPath = Process.findExecutable(arguments[0])?.parentDirectory.appending(component: subcommand)
let subcommandPath = Process.findExecutable(CommandLine.arguments[0])?.parentDirectory.appending(component: subcommand)
?? Process.findExecutable(subcommand)

if subcommandPath == nil || !localFileSystem.exists(subcommandPath!) {
guard let subcommandPath = subcommandPath,
localFileSystem.exists(subcommandPath) else {
throw Driver.Error.unknownOrMissingSubcommand(subcommand)
}

// Pass the full path to subcommand executable.
var arguments = arguments
arguments[0] = subcommandPath.pathString

// Execute the subcommand.
try exec(path: subcommandPath?.pathString ?? "", args: arguments)
try exec(path: subcommandPath.pathString, args: arguments)
}

let executor = try SwiftDriverExecutor(diagnosticsEngine: diagnosticsEngine,
Expand Down