Skip to content

Commit 73fc67a

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 73fc67a

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public extension Driver {
309309
stdoutStream.flush()
310310
}
311311

312-
if supportInProcessSwiftScanQueries {
312+
if false { // supportInProcessSwiftScanQueries {
313313
var scanDiagnostics: [ScannerDiagnosticPayload] = []
314314
guard let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory else {
315315
throw DependencyScanningError.dependencyScanFailed("cannot determine working directory")

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

+2
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)