Skip to content

Add ICU linker flags to all build invocation #270

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
Dec 1, 2021
Merged

Add ICU linker flags to all build invocation #270

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
16 changes: 13 additions & 3 deletions Sources/SwiftToolchain/Toolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,12 @@ public final class Toolchain {
builderArguments.append("--enable-test-discovery")
}

// SwiftWasm 5.5 requires explicit linking arguments in certain configurations,
// see https://github.com/swiftwasm/swift/issues/3891
if version.starts(with: "wasm-5.5") {
builderArguments.append(contentsOf: ["-Xlinker", "-licuuc", "-Xlinker", "-licui18n"])
}

try Builder(
arguments: builderArguments,
mainWasmPath: mainWasmPath,
Expand Down Expand Up @@ -302,9 +308,7 @@ public final class Toolchain {
var builderArguments = [
swiftPath.pathString, "build", "-c", flavor.isRelease ? "release" : "debug",
"--product", testProductName, "--triple", "wasm32-unknown-wasi",
"-Xswiftc", "-color-diagnostics",
// workaround for 5.5 linking issues, see https://github.com/swiftwasm/swift/issues/3891
"-Xlinker", "-licuuc", "-Xlinker", "-licui18n"
"-Xswiftc", "-color-diagnostics"
]

// Versions later than 5.3.x have test discovery enabled by default and the explicit flag
Expand All @@ -313,6 +317,12 @@ public final class Toolchain {
builderArguments.append("--enable-test-discovery")
}

// SwiftWasm 5.5 requires explicit linking arguments in certain configurations,
// see https://github.com/swiftwasm/swift/issues/3891
if version.starts(with: "wasm-5.5") {
builderArguments.append(contentsOf: ["-Xlinker", "-licuuc", "-Xlinker", "-licui18n"])
}

try Builder(
arguments: builderArguments,
mainWasmPath: testBundlePath,
Expand Down