Skip to content

Commit de45d05

Browse files
committed
Stop passing -resource-dir to the Frontend if the flag wasn't passed in on the command-line
1 parent 42f79fb commit de45d05

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public extension Driver {
233233
let forceResponseFiles = parsedOptions.hasArgument(.driverForceResponseFiles)
234234
let imports: InterModuleDependencyImports
235235

236-
if supportInProcessSwiftScanQueries {
236+
if !supportInProcessSwiftScanQueries {
237237
var scanDiagnostics: [ScannerDiagnosticPayload] = []
238238
guard let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory else {
239239
throw DependencyScanningError.dependencyScanFailed("cannot determine working directory")

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,11 +392,13 @@ extension Driver {
392392
try addPathArgument(.absolute(workingDirectory), to: &commandLine, remap: jobNeedPathRemap)
393393
}
394394

395+
if parsedOptions.hasArgument(.resourceDir) {
395396
// Resource directory.
396397
try addPathOption(option: .resourceDir,
397398
path: VirtualPath.lookup(frontendTargetInfo.runtimeResourcePath.path),
398399
to: &commandLine,
399400
remap: jobNeedPathRemap)
401+
}
400402

401403
if self.useStaticResourceDir {
402404
commandLine.appendFlag("-use-static-resource-dir")

0 commit comments

Comments
 (0)