Merge remote-tracking branch 'xtremekforever/swiftlang#65-support-for-armhf' into swiftlang#65-support-building-armhf-sdks

Author: xtremekforever

Sources/GeneratorCLI/GeneratorCLI.swift

@@ -36,6 +36,7 @@ struct GeneratorCLI: AsyncParsableCommand {
         artifactID: options.sdkName ?? recipe.defaultArtifactID,
         isIncremental: options.incremental,
         isVerbose: options.verbose,
+        includeHostToolchain: !options.noHostToolchain,
         logger: logger
       )
 

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Entrypoint.swift

@@ -42,8 +42,11 @@ public extension SwiftSDKGenerator {
       httpClientType = OfflineHTTPClient.self
       #endif
       try await httpClientType.with { client in
-        if !self.isIncremental {
-          try await self.removeRecursively(at: pathsConfiguration.toolchainDirPath)
+        if self.includeHostToolchain {
+          if !self.isIncremental {
+            try await self.removeRecursively(at: pathsConfiguration.toolchainDirPath)
+          }
+          try await self.createDirectoryIfNeeded(at: pathsConfiguration.toolchainDirPath)
         }
 
         try await self.createDirectoryIfNeeded(at: pathsConfiguration.artifactsCachePath)

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Metadata.swift

@@ -26,17 +26,23 @@ extension SwiftSDKGenerator {
 
     let toolsetJSONPath = pathsConfiguration.swiftSDKRootPath.appending("toolset.json")
 
-    var relativeToolchainBinDir = pathsConfiguration.toolchainBinDirPath
+    var toolset: Toolset
+    if self.includeHostToolchain {
+      var relativeToolchainBinDir = pathsConfiguration.toolchainBinDirPath
+
+      guard
+        relativeToolchainBinDir.removePrefix(pathsConfiguration.swiftSDKRootPath)
+      else {
+        fatalError(
+          "`toolchainBinDirPath` is at an unexpected location that prevents computing a relative path"
+        )
+      }
 
-    guard
-      relativeToolchainBinDir.removePrefix(pathsConfiguration.swiftSDKRootPath)
-    else {
-      fatalError(
-        "`toolchainBinDirPath` is at an unexpected location that prevents computing a relative path"
-      )
+      toolset = Toolset(rootPath: relativeToolchainBinDir.string)
+    } else {
+      toolset = Toolset(rootPath: nil)
     }
 
-    var toolset = Toolset(rootPath: relativeToolchainBinDir.string)
     recipe.applyPlatformOptions(toolset: &toolset, targetTriple: self.targetTriple)
     try writeFile(at: toolsetJSONPath, encoder.encode(toolset))
 

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator.swift

@@ -24,6 +24,7 @@ public actor SwiftSDKGenerator {
   let isIncremental: Bool
   let isVerbose: Bool
   let engineCachePath: SQLite.Location
+  let includeHostToolchain: Bool
   let logger: Logger
 
   public init(
@@ -32,6 +33,7 @@ public actor SwiftSDKGenerator {
     artifactID: String,
     isIncremental: Bool,
     isVerbose: Bool,
+    includeHostToolchain: Bool,
     logger: Logger
   ) async throws {
     logGenerationStep("Looking up configuration values...")
@@ -56,6 +58,7 @@ public actor SwiftSDKGenerator {
     self.isVerbose = isVerbose
 
     self.engineCachePath = .path(self.pathsConfiguration.artifactsCachePath.appending("cache.db"))
+    self.includeHostToolchain = includeHostToolchain
     self.logger = logger
   }
 

Tests/SwiftSDKGeneratorTests/ArchitectureMappingTests.swift

@@ -67,6 +67,7 @@ final class ArchitectureMappingTests: XCTestCase {
       // combinations of build and runtime architecture
       isIncremental: false,
       isVerbose: false,
+      includeHostToolchain: true,
       logger: Logger(label: "org.swift.swift-sdk-generator")
     )