Skip to content

Commit 5c013f7

Browse files
kateinoigakukunAnka
authored andcommitted
build: Remove --test-wasm-stdlib option
We already adopted wasi-libc 27, which includes the necessary fix for null builds, so we no longer need a way to run wasm tests without building. Also removing the logic that unintentionally enforced `--test-wasm-stdlib` whenever `--build-wasm-stdlib` was specified.
1 parent f1a7047 commit 5c013f7

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

utils/build_swift/build_swift/driver_arguments.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,6 @@ def _apply_default_arguments(args):
295295
args.test_xros_host = False
296296
args.test_android_host = False
297297

298-
if args.build_wasmstdlib:
299-
args.test_wasmstdlib = True
300-
301298

302299
def create_argument_parser():
303300
"""Return a configured argument parser."""
@@ -862,8 +859,6 @@ def create_argument_parser():
862859
option(['--build-wasm-stdlib'], toggle_true('build_wasmstdlib'),
863860
help='build the stdlib for WebAssembly target into a'
864861
'separate build directory ')
865-
option('--test-wasm-stdlib', toggle_true('test_wasmstdlib'),
866-
help='test stdlib for WebAssembly')
867862
option(['--wasmkit'], toggle_true('build_wasmkit'),
868863
help='build WasmKit')
869864
option(['--install-wasmkit'], toggle_true('install_wasmkit'),

utils/swift_build_support/swift_build_support/build_script_invocation.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -685,9 +685,7 @@ def compute_product_pipelines(self):
685685
builder.add_product(products.WasmKit,
686686
is_enabled=self.args.build_wasmkit)
687687
builder.add_product(products.WasmStdlib,
688-
# Revert `or self.args.test_wasmstdlib` once we adopt `wasi-sdk-26`
689-
# or higher version that includes https://github.com/WebAssembly/wasi-libc/commit/eadb436d5c09f7983c3a687086e5af6b6e9f5510.patch
690-
is_enabled=self.args.build_wasmstdlib or self.args.test_wasmstdlib)
688+
is_enabled=self.args.build_wasmstdlib)
691689
builder.add_product(products.WasmThreadsStdlib,
692690
is_enabled=self.args.build_wasmstdlib)
693691
builder.add_product(products.WasmSwiftSDK,

0 commit comments

Comments
 (0)