Merge pull request #83134 from MaxDesiatov/consistent-wasmkit-path

wasm-run.py: consistent `wasmkit` path 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.

Author: MaxDesiatov

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):

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")