Merge pull request #192 from drexin/wip-static-resource-dir

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

Author: drexin

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -187,6 +187,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 {

Sources/SwiftDriver/Jobs/Planning.swift

@@ -273,12 +273,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_) {

Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift

@@ -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
@@ -145,6 +146,10 @@ extension Toolchain {
       ]
     }
 
+    if useStaticResourceDir {
+       commandLine += [.flag("-use-static-resource-dir")]
+     }
+
     return Job(
       moduleName: "",
       kind: .printTargetInfo,

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -2177,6 +2177,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 {
@@ -2929,6 +2962,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(