Skip to content

[Explicit Module Builds] Handle dependency scanners that produce -o arguments explicitly #1284

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
Feb 8, 2023
Merged

[Explicit Module Builds] Handle dependency scanners that produce -o arguments explicitly #1284

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
15 changes: 12 additions & 3 deletions Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,18 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
commandLine.appendFlag(.explicitInterfaceModuleBuild)
}

// Set the output path
commandLine.appendFlag(.o)
commandLine.appendPath(VirtualPath.lookup(moduleInfo.modulePath.path))
// FIXME: This is a temporary measure meant to be deleted once supported toolchains'
// scanners always output commands with '-o'.
//
// If the dependency scanner did not append its own "-o", add it here.
// This is temporary and is meant to handle both: the scanner that
// appends '-o' and one that doesn't, until we have a toolchain snapshot with the scanner
// that appends '-o' always.
let outputFlagIndeces = commandLine.enumerated().compactMap { $1 == .flag("-o") ? $0 : nil }
if outputFlagIndeces.isEmpty {
commandLine.appendFlag(.o)
commandLine.appendPath(VirtualPath.lookup(moduleInfo.modulePath.path))
}

jobs.append(Job(
moduleName: moduleId.moduleName,
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ extension Diagnostic.Message {
// try resolveVersionedClangDependencies(dependencyGraph: &dependencyGraph)

// Set dependency modules' paths to be saved in the module cache.
try resolveDependencyModulePaths(dependencyGraph: &dependencyGraph)
// try resolveDependencyModulePaths(dependencyGraph: &dependencyGraph)

if parsedOptions.hasArgument(.printExplicitDependencyGraph) {
let outputFormat = parsedOptions.getLastArgument(.explicitDependencyGraphFormat)?.asSingle
Expand Down