Merge pull request #483 from swiftwasm/maxd/fix-embedded-example

Fix `Examples/Embedded` not building with Swift 6.2.3

Author: MaxDesiatov

Examples/Embedded/Package.swift

@@ -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]

Examples/Embedded/Sources/EmbeddedApp/_thingsThatShouldNotBeNeeded.swift

@@ -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

Examples/Embedded/build.sh

@@ -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())