Skip to content

Fix Examples/Embedded not building with Swift 6.2.3 #483

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
kateinoigakukun merged 6 commits into from
Jan 8, 2026
Merged

Fix Examples/Embedded not building with Swift 6.2.3 #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9bee9f7
Fix `Examples/Embedded` not building with Swift 6.2.3
MaxDesiatov Jan 7, 2026
8f4dd4a
Fix formatting
MaxDesiatov Jan 7, 2026
3e61500
Remove unnecessarily hardcoded `.enableExperimentalFeature("Embedded")`
MaxDesiatov Jan 7, 2026
587c1c8
Fix formatting
MaxDesiatov Jan 7, 2026
e595429
Remove unusupported `wasm32-unknown-none-wasm` test
MaxDesiatov Jan 7, 2026
48e6e67
Add back missing `#if !compiler(>=6.3)` clause
MaxDesiatov Jan 7, 2026
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
21 changes: 3 additions & 18 deletions Examples/Embedded/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,17 @@ import PackageDescription
let package = Package(
name: "Embedded",
dependencies: [
.package(name: "JavaScriptKit", path: "../../"),
.package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0"),
.package(name: "JavaScriptKit", path: "../../")
],
targets: [
.executableTarget(
name: "EmbeddedApp",
dependencies: [
"JavaScriptKit",
.product(name: "dlmalloc", package: "swift-dlmalloc"),
"JavaScriptKit"
],
cSettings: [.unsafeFlags(["-fdeclspec"])],
swiftSettings: [
.enableExperimentalFeature("Embedded"),
.enableExperimentalFeature("Extern"),
.unsafeFlags([
"-Xfrontend", "-gnone",
"-Xfrontend", "-disable-stack-protector",
]),
.enableExperimentalFeature("Extern")
],
linkerSettings: [
.unsafeFlags([
"-Xclang-linker", "-nostdlib",
"-Xlinker", "--no-entry",
"-Xlinker", "--export-if-defined=__main_argc_argv",
])
]
)
],
swiftLanguageModes: [.v5]
Expand Down
36 changes: 0 additions & 36 deletions Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions Examples/Embedded/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash
set -euxo pipefail
package_dir="$(cd "$(dirname "$0")" && pwd)"
JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM=true \
swift package --package-path "$package_dir" \
-c release --triple wasm32-unknown-none-wasm js
swift package --package-path "$package_dir" \
-c release --swift-sdk "$(swiftc -print-target-info | jq -r '.swiftCompilerTag')_wasm-embedded" js
12 changes: 0 additions & 12 deletions Plugins/PackageToJS/Tests/ExampleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,18 +355,6 @@ extension Trait where Self == ConditionTrait {

// FIXME: This test fails on the current main snapshot
#if !compiler(>=6.3)
@Test(.requireEmbeddedSwiftInToolchain(triple: "wasm32-unknown-none-wasm"))
func embeddedWasmUnknownNone() throws {
try withPackage(at: "Examples/Embedded") { packageDir, _, runSwift in
try runSwift(
["package", "--triple", "wasm32-unknown-none-wasm", "js", "-c", "release"],
[
"JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM": "true"
]
)
}
}

@Test(.requireEmbeddedSwiftInSwiftSDK())
func embeddedWasmUnknownWasi() throws {
let swiftSDKID = try #require(Self.getEmbeddedSwiftSDKID())
Expand Down