Merge branch 'main' into swiftlang#65-support-armv7

README.md

@@ -125,7 +125,7 @@ swift run swift-sdk-generator make-linux-sdk --with-docker --linux-distribution-
 You can also specify the base container image by name:
 
 ```
-swift run swift-sdk-generator make-linux-sdk --with-docker --from-container-image swift:5.9-jammy
+swift run swift-sdk-generator make-linux-sdk --from-container-image swift:5.9-jammy
 ```
 
 ```

Sources/GeneratorCLI/GeneratorCLI.swift

@@ -115,7 +115,7 @@ extension GeneratorCLI {
       but requires exactly the same version of the swift.org toolchain to be installed for it to work.
       """
     )
-    var hostToolchain: Bool = true
+    var hostToolchain: Bool = false
 
     @Option(
       help: """

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Copy.swift

@@ -18,7 +18,7 @@ extension SwiftSDKGenerator {
     baseDockerImage: String,
     sdkDirPath: FilePath
   ) async throws {
-    logGenerationStep("Launching a Docker container to copy Swift SDK for the target triple from it...")
+    logGenerationStep("Launching a container to extract the Swift SDK for the target triple...")
     try await withDockerContainer(fromImage: baseDockerImage) { containerID in
       try await inTemporaryDirectory { generator, _ in
         let sdkUsrPath = sdkDirPath.appending("usr")

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator.swift

@@ -60,7 +60,7 @@ public actor SwiftSDKGenerator {
   }
 
   private let fileManager = FileManager.default
-  private static let dockerCommand = "docker"
+  private static let dockerCommand = ProcessInfo.processInfo.environment["SWIFT_SDK_GENERATOR_CONTAINER_RUNTIME"] ?? "docker"
 
   public static func getCurrentTriple(isVerbose: Bool) throws -> Triple {
     let current = UnixName.current!

Sources/SwiftSDKGenerator/SwiftSDKRecipes/LinuxRecipe.swift

@@ -66,7 +66,7 @@ public struct LinuxRecipe: SwiftSDKRecipe {
     if let targetSwiftPackagePath {
       targetSwiftSource = .localPackage(FilePath(targetSwiftPackagePath))
     } else {
-      if withDocker {
+      if withDocker || fromContainerImage != nil {
         let imageName = fromContainerImage ?? versionsConfiguration.swiftBaseDockerImage
         targetSwiftSource = .docker(baseSwiftDockerImage: imageName)
       } else {

Tests/SwiftSDKGeneratorTests/EndToEndTests.swift

@@ -124,7 +124,7 @@ final class RepeatedBuildTests: XCTestCase {
 
     // Test that an existing SDK can be rebuilt without cleaning up.
     // Test with no arguments by default:
-    var possibleArguments = [""]
+    var possibleArguments = ["--host-toolchain"]
     do {
       try await Shell.run("docker ps")
       possibleArguments.append("--with-docker --linux-distribution-name rhel --linux-distribution-version ubi9")
@@ -176,6 +176,7 @@ struct SDKConfiguration {
   var sdkGeneratorArguments: String {
     return [
       "--sdk-name \(bundleName)",
+      "--host-toolchain",
       withDocker ? "--with-docker" : nil,
       "--swift-version \(swiftVersion)-RELEASE",
       testLinuxSwiftSDKs ? "--host \(hostArch!)-unknown-linux-gnu" : nil,