Skip to content

Commit 36e5788

Browse files
Merge pull request #465 from swiftwasm/yt/reduce-test-linker
Tests: Reduce usage of Xlinker flags in Makefile
2 parents d3a3058 + f3485f9 commit 36e5788

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ unittest:
99
@echo Running unit tests
1010
env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \
1111
--disable-sandbox \
12-
-Xlinker --stack-first \
13-
-Xlinker --global-base=524288 \
14-
-Xlinker -z \
15-
-Xlinker stack-size=524288 \
1612
js test --prelude ./Tests/prelude.mjs -Xnode --expose-gc
1713

1814
.PHONY: regenerate_swiftpm_resources

Package.swift

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ let shouldBuildForEmbedded = Context.environment["JAVASCRIPTKIT_EXPERIMENTAL_EMB
88
let useLegacyResourceBundling =
99
Context.environment["JAVASCRIPTKIT_USE_LEGACY_RESOURCE_BUNDLING"].flatMap(Bool.init) ?? false
1010

11+
let testingLinkerFlags: [LinkerSetting] = [
12+
.unsafeFlags([
13+
"-Xlinker", "--stack-first",
14+
"-Xlinker", "--global-base=524288",
15+
"-Xlinker", "-z",
16+
"-Xlinker", "stack-size=524288",
17+
])
18+
]
19+
1120
let package = Package(
1221
name: "JavaScriptKit",
1322
platforms: [
@@ -55,7 +64,8 @@ let package = Package(
5564
dependencies: ["JavaScriptKit"],
5665
swiftSettings: [
5766
.enableExperimentalFeature("Extern")
58-
]
67+
],
68+
linkerSettings: testingLinkerFlags
5969
),
6070

6171
.target(
@@ -70,7 +80,8 @@ let package = Package(
7080
.target(name: "_CJavaScriptBigIntSupport", dependencies: ["_CJavaScriptKit"]),
7181
.testTarget(
7282
name: "JavaScriptBigIntSupportTests",
73-
dependencies: ["JavaScriptBigIntSupport", "JavaScriptKit"]
83+
dependencies: ["JavaScriptBigIntSupport", "JavaScriptKit"],
84+
linkerSettings: testingLinkerFlags
7485
),
7586

7687
.target(
@@ -92,7 +103,8 @@ let package = Package(
92103
],
93104
swiftSettings: [
94105
.enableExperimentalFeature("Extern")
95-
]
106+
],
107+
linkerSettings: testingLinkerFlags
96108
),
97109
.target(
98110
name: "JavaScriptEventLoopTestSupport",
@@ -107,7 +119,8 @@ let package = Package(
107119
dependencies: [
108120
"JavaScriptKit",
109121
"JavaScriptEventLoopTestSupport",
110-
]
122+
],
123+
linkerSettings: testingLinkerFlags
111124
),
112125
.target(
113126
name: "JavaScriptFoundationCompat",
@@ -119,7 +132,8 @@ let package = Package(
119132
name: "JavaScriptFoundationCompatTests",
120133
dependencies: [
121134
"JavaScriptFoundationCompat"
122-
]
135+
],
136+
linkerSettings: testingLinkerFlags
123137
),
124138
.plugin(
125139
name: "PackageToJS",
@@ -163,7 +177,8 @@ let package = Package(
163177
],
164178
swiftSettings: [
165179
.enableExperimentalFeature("Extern")
166-
]
180+
],
181+
linkerSettings: testingLinkerFlags
167182
),
168183
]
169184
)

0 commit comments

Comments
 (0)