diff --git a/Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift b/Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift index 2e41da5f9..a40297e6f 100644 --- a/Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift +++ b/Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift @@ -264,11 +264,6 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT for dependencyModule in swiftDependencyArtifacts { inputs.append(TypedVirtualPath(file: dependencyModule.modulePath.path, type: .swiftModule)) - - let prebuiltHeaderDependencyPaths = dependencyModule.prebuiltHeaderDependencyPaths ?? [] - if cas != nil && !prebuiltHeaderDependencyPaths.isEmpty { - throw DependencyScanningError.unsupportedConfigurationForCaching("module \(dependencyModule.moduleName) has bridging header dependency") - } } for moduleArtifactInfo in clangDependencyArtifacts { let clangModulePath = diff --git a/Sources/SwiftDriver/SwiftScan/SwiftScan.swift b/Sources/SwiftDriver/SwiftScan/SwiftScan.swift index b5f80e918..89c1cae31 100644 --- a/Sources/SwiftDriver/SwiftScan/SwiftScan.swift +++ b/Sources/SwiftDriver/SwiftScan/SwiftScan.swift @@ -35,7 +35,6 @@ public enum DependencyScanningError: LocalizedError, DiagnosticData, Equatable { case scanningLibraryInvocationMismatch(String, String) case scanningLibraryNotFound(AbsolutePath) case argumentQueryFailed - case unsupportedConfigurationForCaching(String) public var description: String { switch self { @@ -61,8 +60,6 @@ public enum DependencyScanningError: LocalizedError, DiagnosticData, Equatable { return "Dependency Scanning library not found at path: \(path)" case .argumentQueryFailed: return "Supported compiler argument query failed" - case .unsupportedConfigurationForCaching(let reason): - return "Unsupported configuration for -cache-compile-job, consider turn off swift caching: \(reason)" } } diff --git a/Tests/SwiftDriverTests/CachingBuildTests.swift b/Tests/SwiftDriverTests/CachingBuildTests.swift index 936b563d1..b1c9acc2b 100644 --- a/Tests/SwiftDriverTests/CachingBuildTests.swift +++ b/Tests/SwiftDriverTests/CachingBuildTests.swift @@ -709,9 +709,9 @@ final class CachingBuildTests: XCTestCase { main.nativePathString(escaped: true)] + sdkArgumentsForTesting, env: ProcessEnv.vars, interModuleDependencyOracle: dependencyOracle) - // This is currently not supported. - XCTAssertThrowsError(try driver.planBuild()) { - XCTAssertEqual($0 as? DependencyScanningError, .unsupportedConfigurationForCaching("module Foo has bridging header dependency")) + let jobs = try driver.planBuild() + for job in jobs { + XCTAssertFalse(job.outputCacheKeys.isEmpty) } } }