Skip to content

Pass -use-static-resource-dir to frontend when linking statically #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2020
Merged

Pass -use-static-resource-dir to frontend when linking statically #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,15 @@ extension Driver {
commandLine.appendPath(
try AbsolutePath(validating: frontendTargetInfo.paths.runtimeResourcePath))

if parsedOptions.hasFlag(positive: .staticExecutable,
negative: .noStaticExecutable,
default: false) ||
parsedOptions.hasFlag(positive: .staticStdlib,
negative: .noStaticStdlib,
default: false) {
commandLine.appendFlag("-use-static-resource-dir")
}

// -g implies -enable-anonymous-context-mangled-names, because the extra
// metadata aids debugging.
if parsedOptions.getLast(in: .g) != nil {
Expand Down
12 changes: 11 additions & 1 deletion Sources/SwiftDriver/Jobs/Planning.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,22 @@ extension Driver {
if parsedOptions.hasArgument(.printTargetInfo) {
let sdkPath = try parsedOptions.getLastArgument(.sdk).map { try VirtualPath(path: $0.asSingle) }
let resourceDirPath = try parsedOptions.getLastArgument(.resourceDir).map { try VirtualPath(path: $0.asSingle) }
var useStaticResourceDir = false
if parsedOptions.hasFlag(positive: .staticExecutable,
negative: .noStaticExecutable,
default: false) ||
parsedOptions.hasFlag(positive: .staticStdlib,
negative: .noStaticStdlib,
default: false) {
useStaticResourceDir = true
}

return try toolchain.printTargetInfoJob(target: targetTriple,
targetVariant: targetVariantTriple,
sdkPath: sdkPath,
resourceDirPath: resourceDirPath,
requiresInPlaceExecution: true)
requiresInPlaceExecution: true,
useStaticResourceDir: useStaticResourceDir)
}

if parsedOptions.hasArgument(.version) || parsedOptions.hasArgument(.version_) {
Expand Down
7 changes: 6 additions & 1 deletion Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ extension Toolchain {
sdkPath: VirtualPath? = nil,
resourceDirPath: VirtualPath? = nil,
runtimeCompatibilityVersion: String? = nil,
requiresInPlaceExecution: Bool = false) throws -> Job {
requiresInPlaceExecution: Bool = false,
useStaticResourceDir: Bool = false) throws -> Job {
var commandLine: [Job.ArgTemplate] = [.flag("-frontend"),
.flag("-print-target-info")]
// If we were given a target, include it. Otherwise, let the frontend
Expand Down Expand Up @@ -145,6 +146,10 @@ extension Toolchain {
]
}

if useStaticResourceDir {
commandLine += [.flag("-use-static-resource-dir")]
}

return Job(
moduleName: "",
kind: .printTargetInfo,
Expand Down
70 changes: 70 additions & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,39 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertTrue(job.commandLine.contains(.flag("-sdk")))
XCTAssertTrue(job.commandLine.contains(.flag("-resource-dir")))
}

do {
var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-unknown-linux"])
let plannedJobs = try driver.planBuild()
XCTAssertTrue(plannedJobs.count == 1)
let job = plannedJobs[0]
XCTAssertEqual(job.kind, .printTargetInfo)
XCTAssertTrue(job.commandLine.contains(.flag("-print-target-info")))
XCTAssertTrue(job.commandLine.contains(.flag("-target")))
XCTAssertFalse(job.commandLine.contains(.flag("-use-static-resource-dir")))
}

do {
var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-unknown-linux", "-static-stdlib"])
let plannedJobs = try driver.planBuild()
XCTAssertTrue(plannedJobs.count == 1)
let job = plannedJobs[0]
XCTAssertEqual(job.kind, .printTargetInfo)
XCTAssertTrue(job.commandLine.contains(.flag("-print-target-info")))
XCTAssertTrue(job.commandLine.contains(.flag("-target")))
XCTAssertTrue(job.commandLine.contains(.flag("-use-static-resource-dir")))
}

do {
var driver = try Driver(args: ["swift", "-print-target-info", "-target", "x86_64-unknown-linux", "-static-executable"])
let plannedJobs = try driver.planBuild()
XCTAssertTrue(plannedJobs.count == 1)
let job = plannedJobs[0]
XCTAssertEqual(job.kind, .printTargetInfo)
XCTAssertTrue(job.commandLine.contains(.flag("-print-target-info")))
XCTAssertTrue(job.commandLine.contains(.flag("-target")))
XCTAssertTrue(job.commandLine.contains(.flag("-use-static-resource-dir")))
}
}

func testDiagnosticOptions() throws {
Expand Down Expand Up @@ -2495,6 +2528,43 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertEqual(compileJob.outputs[1].file, .temporary(RelativePath("foo.swiftdoc")))
}
}

func testUseStaticResourceDir() throws {
do {
var driver = try Driver(args: ["swiftc", "-emit-module", "-target", "x86_64-unknown-linux", "foo.swift"])
let plannedJobs = try driver.planBuild()
let job = plannedJobs[0]
XCTAssertFalse(job.commandLine.contains(.flag("-use-static-resource-dir")))
}

do {
var driver = try Driver(args: ["swiftc", "-emit-module", "-target", "x86_64-unknown-linux", "-no-static-executable", "foo.swift"])
let plannedJobs = try driver.planBuild()
let job = plannedJobs[0]
XCTAssertFalse(job.commandLine.contains(.flag("-use-static-resource-dir")))
}

do {
var driver = try Driver(args: ["swiftc", "-emit-module", "-target", "x86_64-unknown-linux", "-no-static-stdlib", "foo.swift"])
let plannedJobs = try driver.planBuild()
let job = plannedJobs[0]
XCTAssertFalse(job.commandLine.contains(.flag("-use-static-resource-dir")))
}

do {
var driver = try Driver(args: ["swiftc", "-emit-module", "-target", "x86_64-unknown-linux", "-static-executable", "foo.swift"])
let plannedJobs = try driver.planBuild()
let job = plannedJobs[0]
XCTAssertTrue(job.commandLine.contains(.flag("-use-static-resource-dir")))
}

do {
var driver = try Driver(args: ["swiftc", "-emit-module", "-target", "x86_64-unknown-linux", "-static-stdlib", "foo.swift"])
let plannedJobs = try driver.planBuild()
let job = plannedJobs[0]
XCTAssertTrue(job.commandLine.contains(.flag("-use-static-resource-dir")))
}
}
}

func assertString(
Expand Down