Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ unittest:
@echo Running unit tests
env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \
--disable-sandbox \
-Xlinker --stack-first \
-Xlinker --global-base=524288 \
-Xlinker -z \
-Xlinker stack-size=524288 \
js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc

.PHONY: regenerate_swiftpm_resources
Expand Down
27 changes: 21 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMB
let useLegacyResourceBundling =
Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false

let testingLinkerFlags: [LinkerSetting] = [
.unsafeFlags([
"-Xlinker", "--stack-first",
"-Xlinker", "--global-base=524288",
"-Xlinker", "-z",
"-Xlinker", "stack-size=524288",
])
]

let package = Package(
name: "JavaScriptKit",
platforms: [
Expand Down Expand Up @@ -55,7 +64,8 @@ let package = Package(
dependencies: ["JavaScriptKit"],
swiftSettings: [
.enableExperimentalFeature("Extern")
]
],
linkerSettings: testingLinkerFlags
),

.target(
Expand All @@ -70,7 +80,8 @@ let package = Package(
.target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]),
.testTarget(
name: "JavaScriptBigIntSupportTests",
dependencies: ["JavaScriptBigIntSupport", "JavaScriptKit"]
dependencies: ["JavaScriptBigIntSupport", "JavaScriptKit"],
linkerSettings: testingLinkerFlags
),

.target(
Expand All @@ -92,7 +103,8 @@ let package = Package(
],
swiftSettings: [
.enableExperimentalFeature("Extern")
]
],
linkerSettings: testingLinkerFlags
),
.target(
name: "JavaScriptEventLoopTestSupport",
Expand All @@ -107,7 +119,8 @@ let package = Package(
dependencies: [
"JavaScriptKit",
"JavaScriptEventLoopTestSupport",
]
],
linkerSettings: testingLinkerFlags
),
.target(
name: "JavaScriptFoundationCompat",
Expand All @@ -119,7 +132,8 @@ let package = Package(
name: "JavaScriptFoundationCompatTests",
dependencies: [
"JavaScriptFoundationCompat"
]
],
linkerSettings: testingLinkerFlags
),
.plugin(
name: "PackageToJS",
Expand Down Expand Up @@ -163,7 +177,8 @@ let package = Package(
],
swiftSettings: [
.enableExperimentalFeature("Extern")
]
],
linkerSettings: testingLinkerFlags
),
]
)