Skip to content

Commit 28ee192

Browse files
authored
Switch away from using a deprecated Driver 'init' with 'externalTargetModulePathMap' argument. (#5828)
Replacing it with 'externalTargetModuleDetailsMap'.
1 parent e79908c commit 28ee192

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Sources/Build/LLBuildManifestBuilder.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@ extension LLBuildManifestBuilder {
411411
explicitDependencyJobTracker: UniqueExplicitDependencyJobTracker? = nil
412412
) throws {
413413
// Pass the driver its external dependencies (target dependencies)
414-
var dependencyModulePathMap: SwiftDriver.ExternalTargetModulePathMap = [:]
414+
var dependencyModuleDetailsMap: SwiftDriver.ExternalTargetModuleDetailsMap = [:]
415415
// Collect paths for target dependencies of this target (direct and transitive)
416-
try self.collectTargetDependencyModulePaths(for: targetDescription.target, dependencyModulePathMap: &dependencyModulePathMap)
416+
try self.collectTargetDependencyModuleDetails(for: targetDescription.target, dependencyModuleDetailsMap: &dependencyModuleDetailsMap)
417417

418418
// Compute the set of frontend
419419
// jobs needed to build this Swift target.
@@ -428,7 +428,7 @@ extension LLBuildManifestBuilder {
428428
var driver = try Driver(args: commandLine,
429429
fileSystem: self.fileSystem,
430430
executor: executor,
431-
externalTargetModulePathMap: dependencyModulePathMap,
431+
externalTargetModuleDetailsMap: dependencyModuleDetailsMap,
432432
interModuleDependencyOracle: dependencyOracle
433433
)
434434
let jobs = try driver.planBuild()
@@ -439,9 +439,9 @@ extension LLBuildManifestBuilder {
439439

440440
/// Collect a map from all target dependencies of the specified target to the build planning artifacts for said dependency,
441441
/// in the form of a path to a .swiftmodule file and the dependency's InterModuleDependencyGraph.
442-
private func collectTargetDependencyModulePaths(
442+
private func collectTargetDependencyModuleDetails(
443443
for target: ResolvedTarget,
444-
dependencyModulePathMap: inout SwiftDriver.ExternalTargetModulePathMap
444+
dependencyModuleDetailsMap: inout SwiftDriver.ExternalTargetModuleDetailsMap
445445
) throws {
446446
for dependency in target.dependencies(satisfying: self.buildEnvironment) {
447447
switch dependency {
@@ -451,29 +451,29 @@ extension LLBuildManifestBuilder {
451451
throw InternalError("unknown dependency product for \(dependency)")
452452
}
453453
for dependencyProductTarget in dependencyProduct.targets {
454-
try self.addTargetDependencyInfo(for: dependencyProductTarget, dependencyModulePathMap: &dependencyModulePathMap)
454+
try self.addTargetDependencyInfo(for: dependencyProductTarget, dependencyModuleDetailsMap: &dependencyModuleDetailsMap)
455455

456456
}
457457
case .target:
458458
// Product dependencies are broken down into the targets that make them up.
459459
guard let dependencyTarget = dependency.target else {
460460
throw InternalError("unknown dependency target for \(dependency)")
461461
}
462-
try self.addTargetDependencyInfo(for: dependencyTarget, dependencyModulePathMap: &dependencyModulePathMap)
462+
try self.addTargetDependencyInfo(for: dependencyTarget, dependencyModuleDetailsMap: &dependencyModuleDetailsMap)
463463
}
464464
}
465465
}
466466

467467
private func addTargetDependencyInfo(
468468
for target: ResolvedTarget,
469-
dependencyModulePathMap: inout SwiftDriver.ExternalTargetModulePathMap
469+
dependencyModuleDetailsMap: inout SwiftDriver.ExternalTargetModuleDetailsMap
470470
) throws {
471471
guard case .swift(let dependencySwiftTargetDescription) = plan.targetMap[target] else {
472472
return
473473
}
474-
dependencyModulePathMap[ModuleDependencyId.swiftPlaceholder(target.c99name)] =
475-
dependencySwiftTargetDescription.moduleOutputPath
476-
try self.collectTargetDependencyModulePaths(for: target, dependencyModulePathMap: &dependencyModulePathMap)
474+
dependencyModuleDetailsMap[ModuleDependencyId.swiftPlaceholder(target.c99name)] =
475+
SwiftDriver.ExternalTargetModuleDetails(path: dependencySwiftTargetDescription.moduleOutputPath, isFramework: false)
476+
try self.collectTargetDependencyModuleDetails(for: target, dependencyModuleDetailsMap: &dependencyModuleDetailsMap)
477477
}
478478

479479
private func addSwiftCmdsEmitSwiftModuleSeparately(

0 commit comments

Comments
 (0)