Skip to content

WasmSDK: Copy swift-foundation headers and apinotes into the Swift SDK bundle #129

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 5 commits into from
Aug 28, 2024
Merged

WasmSDK: Copy swift-foundation headers and apinotes into the Swift SDK bundle #129

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f604cc
WasmSDK: Copy swift-foundation headers and apinotes into the Swift SD…
kateinoigakukun Aug 28, 2024
c4f6a7d
Merge branch 'main' into yt/swift-foundation
MaxDesiatov Aug 28, 2024
26a65a0
Create swift.xctoolchain/usr directory before copying target package
kateinoigakukun Aug 28, 2024
6d5e97a
Merge branch 'main' into yt/swift-foundation
MaxDesiatov Aug 28, 2024
c393223
Merge branch 'main' into yt/swift-foundation
MaxDesiatov Aug 28, 2024
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
13 changes: 10 additions & 3 deletions Sources/SwiftSDKGenerator/SwiftSDKRecipes/WebAssemblyRecipe.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public struct WebAssemblyRecipe: SwiftSDKRecipe {
httpClient: some HTTPClientProtocol
) async throws -> SwiftSDKProduct {
let pathsConfiguration = generator.pathsConfiguration
let targetSwiftLibPath = self.targetSwiftPackagePath.appending("usr/lib")

logGenerationStep("Copying Swift binaries for the host triple...")
var hostTriples: [Triple]? = nil
if let hostSwiftPackage {
Expand All @@ -117,10 +119,14 @@ public struct WebAssemblyRecipe: SwiftSDKRecipe {
libraries: unusedHostLibraries + liblldbNames,
binaries: unusedHostBinaries + ["lldb", "lldb-argdumper", "lldb-server"]
)
// Merge target Swift package with the host package.
try await self.mergeTargetSwift(from: targetSwiftLibPath, generator: generator)
} else {
// Simply copy the target Swift package into the SDK bundle when building host-agnostic SDK.
try await generator.createDirectoryIfNeeded(at: pathsConfiguration.toolchainDirPath.appending("usr"))
try await generator.copy(from: targetSwiftLibPath, to: pathsConfiguration.toolchainDirPath.appending("usr/lib"))
}

try await self.copyTargetSwift(from: self.targetSwiftPackagePath.appending("usr/lib"), generator: generator)

let autolinkExtractPath = generator.pathsConfiguration.toolchainBinDirPath.appending("swift-autolink-extract")

// WebAssembly object file requires `swift-autolink-extract`
Expand All @@ -138,7 +144,8 @@ public struct WebAssemblyRecipe: SwiftSDKRecipe {
return SwiftSDKProduct(sdkDirPath: sdkDirPath, hostTriples: hostTriples)
}

func copyTargetSwift(from distributionPath: FilePath, generator: SwiftSDKGenerator) async throws {
/// Merge the target Swift package into the Swift SDK bundle derived from the host Swift package.
func mergeTargetSwift(from distributionPath: FilePath, generator: SwiftSDKGenerator) async throws {
let pathsConfiguration = generator.pathsConfiguration
logGenerationStep("Copying Swift core libraries for the target triple into Swift SDK bundle...")
for (pathWithinPackage, pathWithinSwiftSDK, isOptional) in [
Expand Down