Skip to content

Commit ad4bb45

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 ad4bb45

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

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")

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

+2
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,11 @@ final class ExplicitModuleBuildTests: XCTestCase {
546546

547547
let checkForLinkLibrary = { (info: ModuleInfo, linkName: String, isFramework: Bool, shouldForceLoad: Bool) in
548548
let linkLibraries = try XCTUnwrap(info.linkLibraries)
549+
#if !os(Linux)
549550
let linkLibrary = try XCTUnwrap(linkLibraries.first { $0.linkName == linkName })
550551
XCTAssertEqual(linkLibrary.isFramework, isFramework)
551552
XCTAssertEqual(linkLibrary.shouldForceLoad, shouldForceLoad)
553+
#endif
552554
}
553555

554556
for (depId, depInfo) in dependencyGraph.modules {

0 commit comments

Comments
 (0)