@@ -411,9 +411,9 @@ extension LLBuildManifestBuilder {
411
411
explicitDependencyJobTracker: UniqueExplicitDependencyJobTracker ? = nil
412
412
) throws {
413
413
// Pass the driver its external dependencies (target dependencies)
414
- var dependencyModulePathMap : SwiftDriver . ExternalTargetModulePathMap = [ : ]
414
+ var dependencyModuleDetailsMap : SwiftDriver . ExternalTargetModuleDetailsMap = [ : ]
415
415
// 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 )
417
417
418
418
// Compute the set of frontend
419
419
// jobs needed to build this Swift target.
@@ -428,7 +428,7 @@ extension LLBuildManifestBuilder {
428
428
var driver = try Driver ( args: commandLine,
429
429
fileSystem: self . fileSystem,
430
430
executor: executor,
431
- externalTargetModulePathMap : dependencyModulePathMap ,
431
+ externalTargetModuleDetailsMap : dependencyModuleDetailsMap ,
432
432
interModuleDependencyOracle: dependencyOracle
433
433
)
434
434
let jobs = try driver. planBuild ( )
@@ -439,9 +439,9 @@ extension LLBuildManifestBuilder {
439
439
440
440
/// Collect a map from all target dependencies of the specified target to the build planning artifacts for said dependency,
441
441
/// in the form of a path to a .swiftmodule file and the dependency's InterModuleDependencyGraph.
442
- private func collectTargetDependencyModulePaths (
442
+ private func collectTargetDependencyModuleDetails (
443
443
for target: ResolvedTarget ,
444
- dependencyModulePathMap : inout SwiftDriver . ExternalTargetModulePathMap
444
+ dependencyModuleDetailsMap : inout SwiftDriver . ExternalTargetModuleDetailsMap
445
445
) throws {
446
446
for dependency in target. dependencies ( satisfying: self . buildEnvironment) {
447
447
switch dependency {
@@ -451,29 +451,29 @@ extension LLBuildManifestBuilder {
451
451
throw InternalError ( " unknown dependency product for \( dependency) " )
452
452
}
453
453
for dependencyProductTarget in dependencyProduct. targets {
454
- try self . addTargetDependencyInfo ( for: dependencyProductTarget, dependencyModulePathMap : & dependencyModulePathMap )
454
+ try self . addTargetDependencyInfo ( for: dependencyProductTarget, dependencyModuleDetailsMap : & dependencyModuleDetailsMap )
455
455
456
456
}
457
457
case . target:
458
458
// Product dependencies are broken down into the targets that make them up.
459
459
guard let dependencyTarget = dependency. target else {
460
460
throw InternalError ( " unknown dependency target for \( dependency) " )
461
461
}
462
- try self . addTargetDependencyInfo ( for: dependencyTarget, dependencyModulePathMap : & dependencyModulePathMap )
462
+ try self . addTargetDependencyInfo ( for: dependencyTarget, dependencyModuleDetailsMap : & dependencyModuleDetailsMap )
463
463
}
464
464
}
465
465
}
466
466
467
467
private func addTargetDependencyInfo(
468
468
for target: ResolvedTarget ,
469
- dependencyModulePathMap : inout SwiftDriver . ExternalTargetModulePathMap
469
+ dependencyModuleDetailsMap : inout SwiftDriver . ExternalTargetModuleDetailsMap
470
470
) throws {
471
471
guard case . swift( let dependencySwiftTargetDescription) = plan. targetMap [ target] else {
472
472
return
473
473
}
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 )
477
477
}
478
478
479
479
private func addSwiftCmdsEmitSwiftModuleSeparately(
0 commit comments