Skip to content

Commit 2f7122d

Browse files
Merge pull request #679 from swiftwasm/update-base-tag/main-swift-DEVELOPMENT-SNAPSHOT-2025-12-15-a
Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2025-12-15-a
2 parents c1a4e16 + e2aa2ec commit 2f7122d

File tree

3 files changed

+57
-1
lines changed

3 files changed

+57
-1
lines changed

schemes/main/build/build-target-toolchain.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ main() {
120120
--skip-build-cmark \
121121
--skip-build-benchmarks \
122122
--skip-early-swift-driver \
123+
--skip-test-wasm-stdlib \
123124
--wasmkit \
124125
--build-wasm-stdlib \
125126
--skip-test-wasm-stdlib \

schemes/main/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-12-01-a",
2+
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-12-15-a",
33
"icu4c": [],
44
"libxml2": [],
55
"swift-org-download-channel": "development"
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
From 74a02c6ecdf75f3dabd2ccd2d2cc92aeb32412b0 Mon Sep 17 00:00:00 2001
2+
From: Yuta Saito <[email protected]>
3+
Date: Fri, 19 Dec 2025 22:10:57 +0900
4+
Subject: [PATCH] build: Remove `--test-wasm-stdlib` option
5+
6+
We already adopted wasi-libc 27, which includes the necessary fix for
7+
null builds, so we no longer need a way to run wasm tests without
8+
building. Also removing the logic that unintentionally enforced
9+
`--test-wasm-stdlib` whenever `--build-wasm-stdlib` was specified.
10+
---
11+
utils/build_swift/build_swift/driver_arguments.py | 5 -----
12+
.../swift_build_support/build_script_invocation.py | 4 +---
13+
2 files changed, 1 insertion(+), 8 deletions(-)
14+
15+
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
16+
index cf0a31a4548..f56f5afc81f 100644
17+
--- a/utils/build_swift/build_swift/driver_arguments.py
18+
+++ b/utils/build_swift/build_swift/driver_arguments.py
19+
@@ -295,9 +295,6 @@ def _apply_default_arguments(args):
20+
args.test_xros_host = False
21+
args.test_android_host = False
22+
23+
- if args.build_wasmstdlib:
24+
- args.test_wasmstdlib = True
25+
-
26+
27+
def create_argument_parser():
28+
"""Return a configured argument parser."""
29+
@@ -862,8 +859,6 @@ def create_argument_parser():
30+
option(['--build-wasm-stdlib'], toggle_true('build_wasmstdlib'),
31+
help='build the stdlib for WebAssembly target into a'
32+
'separate build directory ')
33+
- option('--test-wasm-stdlib', toggle_true('test_wasmstdlib'),
34+
- help='test stdlib for WebAssembly')
35+
option(['--wasmkit'], toggle_true('build_wasmkit'),
36+
help='build WasmKit')
37+
option(['--install-wasmkit'], toggle_true('install_wasmkit'),
38+
diff --git a/utils/swift_build_support/swift_build_support/build_script_invocation.py b/utils/swift_build_support/swift_build_support/build_script_invocation.py
39+
index f52bf2237ef..e8ca4385407 100644
40+
--- a/utils/swift_build_support/swift_build_support/build_script_invocation.py
41+
+++ b/utils/swift_build_support/swift_build_support/build_script_invocation.py
42+
@@ -685,9 +685,7 @@ class BuildScriptInvocation(object):
43+
builder.add_product(products.WasmKit,
44+
is_enabled=self.args.build_wasmkit)
45+
builder.add_product(products.WasmStdlib,
46+
- # Revert `or self.args.test_wasmstdlib` once we adopt `wasi-sdk-26`
47+
- # or higher version that includes https://github.com/WebAssembly/wasi-libc/commit/eadb436d5c09f7983c3a687086e5af6b6e9f5510.patch
48+
- is_enabled=self.args.build_wasmstdlib or self.args.test_wasmstdlib)
49+
+ is_enabled=self.args.build_wasmstdlib)
50+
builder.add_product(products.WasmThreadsStdlib,
51+
is_enabled=self.args.build_wasmstdlib)
52+
builder.add_product(products.WasmSwiftSDK,
53+
--
54+
2.48.1
55+

0 commit comments

Comments
 (0)