Skip to content

Commit e14a756

Browse files
committed
get rid of external flags for building
1 parent 43607e5 commit e14a756

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

Diff for: Examples/Embedded/Package.swift

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ let package = Package(
1616
.product(name: "dlmalloc", package: "swift-dlmalloc")
1717
],
1818
cSettings: [
19-
.unsafeFlags(["-fdeclspec"])
19+
.unsafeFlags(["-fdeclspec"]),
20+
.define("__Embedded"),
2021
],
2122
swiftSettings: [
2223
.enableExperimentalFeature("Embedded"),
@@ -29,7 +30,8 @@ let package = Package(
2930
linkerSettings: [
3031
.unsafeFlags([
3132
"-Xclang-linker", "-nostdlib",
32-
"-Xlinker", "--no-entry"
33+
"-Xlinker", "--no-entry",
34+
"-Xlinker", "--export-if-defined=__main_argc_argv"
3335
])
3436
]
3537
)

Diff for: Examples/Embedded/build.sh

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
#!/bin/bash
22
package_dir="$(cd "$(dirname "$0")" && pwd)"
3-
JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM=true swift build --package-path "$package_dir" -c release --product EmbeddedApp \
4-
--triple wasm32-unknown-none-wasm \
5-
-Xswiftc -enable-experimental-feature -Xswiftc Embedded \
6-
-Xswiftc -enable-experimental-feature -Xswiftc Extern \
7-
-Xcc -D__Embedded -Xcc -fdeclspec \
8-
-Xlinker --export-if-defined=__main_argc_argv \
9-
-Xlinker --export-if-defined=swjs_call_host_function \
10-
-Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor
3+
JAVASCRIPTKIT_EXPERIMENTAL_EMBEDDED_WASM=true \
4+
swift build --package-path "$package_dir" --product EmbeddedApp \
5+
-c release --triple wasm32-unknown-none-wasm

Diff for: Package.swift

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.7
1+
// swift-tools-version:5.8
22

33
import PackageDescription
44
import Foundation
@@ -19,11 +19,21 @@ let package = Package(
1919
name: "JavaScriptKit",
2020
dependencies: ["_CJavaScriptKit"],
2121
resources: shouldBuildForEmbedded ? [] : [.copy("Runtime")],
22+
cSettings: shouldBuildForEmbedded ? [
23+
.unsafeFlags(["-fdeclspec"]),
24+
.define("__Embedded"),
25+
] : nil,
2226
swiftSettings: shouldBuildForEmbedded
23-
? [.unsafeFlags(["-Xfrontend", "-emit-empty-object-file"])]
24-
: []
27+
? [
28+
.enableExperimentalFeature("Embedded"),
29+
.enableExperimentalFeature("Extern"),
30+
.unsafeFlags(["-Xfrontend", "-emit-empty-object-file"])
31+
] : nil,
32+
),
33+
.target(
34+
name: "_CJavaScriptKit",
35+
cSettings: shouldBuildForEmbedded ? [.define("__Embedded")] : nil
2536
),
26-
.target(name: "_CJavaScriptKit"),
2737
.target(
2838
name: "JavaScriptBigIntSupport",
2939
dependencies: ["_CJavaScriptBigIntSupport", "JavaScriptKit"]

0 commit comments

Comments
 (0)