From 326c73f5eceaeed8e1dbb6d63c62b682140a614c Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 17 Jul 2025 17:16:07 +0100 Subject: [PATCH 1/2] wasm-run.py: make `wasmkit` path consistent with `build_runtime_with_host_compiler` When passing `--build-runtime-with-host-compiler` there's no such executable `wasmkit-cli` in the host toolchain, where it's named `wasmkit` when installed. Let's make that consistent to make it work in both cases. --- utils/wasm-run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/wasm-run.py b/utils/wasm-run.py index b819adca56b3e..6b13cb43ca0f1 100755 --- a/utils/wasm-run.py +++ b/utils/wasm-run.py @@ -24,7 +24,7 @@ def run(self, args): subprocess.check_call(command) def invocation(self, args): - command = ["wasmkit-cli", "run"] + command = ["wasmkit", "run"] envs = collect_wasm_env() for key in envs: command.append("--env") From b9721408f7d787fa31c5408f18c09b220a56f13f Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 18 Jul 2025 09:54:46 +0100 Subject: [PATCH 2/2] wasmkit.py: copy to `wasmkit` not `wasmkit-cli` path --- .../swift_build_support/swift_build_support/products/wasmkit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/swift_build_support/swift_build_support/products/wasmkit.py b/utils/swift_build_support/swift_build_support/products/wasmkit.py index 4f0acbf698263..8756b8930377e 100644 --- a/utils/swift_build_support/swift_build_support/products/wasmkit.py +++ b/utils/swift_build_support/swift_build_support/products/wasmkit.py @@ -69,7 +69,7 @@ def build(self, host_target): @classmethod def cli_file_path(cls, build_dir): - return os.path.join(build_dir, 'bin', 'wasmkit-cli') + return os.path.join(build_dir, 'bin', 'wasmkit') def run_swift_build(host_target, product, swiftpm_package_product_name, set_installation_rpath=False):