use __wasi__ instead of __Embedded

swiftwasm · Oct 30, 2024 · fbd62f4 · fbd62f4
1 parent d4348f3
commit fbd62f4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/Examples/Embedded/Package.swift b/Examples/Embedded/Package.swift
@@ -15,10 +15,7 @@ let package = Package(
                 "JavaScriptKit",
                 .product(name: "dlmalloc", package: "swift-dlmalloc")
             ],
-            cSettings: [
-                .unsafeFlags(["-fdeclspec"]),
-                .define("__Embedded"),
-            ],
+            cSettings: [.unsafeFlags(["-fdeclspec"])],
             swiftSettings: [
                 .enableExperimentalFeature("Embedded"),
                 .enableExperimentalFeature("Extern"),

diff --git a/Package.swift b/Package.swift
@@ -19,8 +19,7 @@ let package = Package(
             dependencies: ["_CJavaScriptKit"], 
             resources: shouldBuildForEmbedded ? [] : [.copy("Runtime")],
             cSettings: shouldBuildForEmbedded ? [
-                    .unsafeFlags(["-fdeclspec"]),
-                    .define("__Embedded"),
+                    .unsafeFlags(["-fdeclspec"])
                 ] : nil,
             swiftSettings: shouldBuildForEmbedded 
                 ? [
@@ -29,10 +28,7 @@ let package = Package(
                     .unsafeFlags(["-Xfrontend", "-emit-empty-object-file"])
                 ] : nil,
         ),
-        .target(
-            name: "_CJavaScriptKit",
-            cSettings: shouldBuildForEmbedded ? [.define("__Embedded")] : nil
-        ),
+        .target(name: "_CJavaScriptKit"),
         .target(
             name: "JavaScriptBigIntSupport",
             dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"]

diff --git a/Sources/_CJavaScriptKit/_CJavaScriptKit.c b/Sources/_CJavaScriptKit/_CJavaScriptKit.c
@@ -1,6 +1,6 @@
 #include "_CJavaScriptKit.h"
 #if __wasm32__
-#if __Embedded
+#ifndef __wasi__
 #if __has_include("malloc.h")
 #include <malloc.h>
 #endif
@@ -31,8 +31,10 @@ void swjs_cleanup_host_function_call(void *argv_buffer) {
     free(argv_buffer);
 }
 
-#ifndef __Embedded
-// cdecls don't work in Embedded, also @_expose(wasm) can be used with Swift >=6.0
+// NOTE: This __wasi__ check is a hack for Embedded compatibility (assuming that if __wasi__ is defined, we are not building for Embedded)
+// cdecls don't work in Embedded, but @_expose(wasm) can be used with Swift >=6.0
+// the previously used `#if __Embedded` did not play well with SwiftPM (defines needed to be on every target up the chain)
+#ifdef __wasi__
 bool _call_host_function_impl(const JavaScriptHostFuncRef host_func_ref,
                               const RawJSValue *argv, const int argc,
                               const JavaScriptObjectRef callback_func);

diff --git a/Sources/_CJavaScriptKit/include/_CJavaScriptKit.h b/Sources/_CJavaScriptKit/include/_CJavaScriptKit.h
@@ -1,7 +1,7 @@
 #ifndef _CJavaScriptKit_h
 #define _CJavaScriptKit_h
 
-#if __Embedded
+#ifndef __wasi__
 #include <stddef.h>
 #else
 #include <stdlib.h>