Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-12-04 02:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.Build.Step.Run: Fix invocation syntax for Wasmtime 14+.

Browse Source 
https://github.com/bytecodealliance/wasmtime/issues/7384
This commit is contained in:
Alex Rønne Petersen 2024-07-22 21:59:56 +02:00 committed by Andrew Kelley
parent 718f8d5314
commit be1e1fa180
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/std/Build/Step/Run.zig
View File

@ -1007,10 +1007,25 @@ fn runCommand(
}, },
.wasmtime => |bin_name| { .wasmtime => |bin_name| {
if (b.enable_wasmtime) { if (b.enable_wasmtime) {
// https://github.com/bytecodealliance/wasmtime/issues/7384
//
// In Wasmtime versions prior to 14, options passed after the module name
// could be interpreted by Wasmtime if it recognized them. As with many CLI
// tools, the `--` token is used to stop that behavior and indicate that the
// remaining arguments are for the WASM program being executed. Historically,
// we passed `--` after the module name here.
//
// After version 14, the `--` can no longer be passed after the module name,
// but is also not necessary as Wasmtime will no longer try to interpret
// options after the module name. So, we could just simply omit `--` for
// newer Wasmtime versions. But to maintain compatibility for older versions
// that still try to interpret options after the module name, we have moved
// the `--` before the module name. This appears to work for both old and
// new Wasmtime versions.
try interp_argv.append(bin_name); try interp_argv.append(bin_name);
try interp_argv.append("--dir=."); try interp_argv.append("--dir=.");
try interp_argv.append(argv[0]);
try interp_argv.append("--"); try interp_argv.append("--");
try interp_argv.append(argv[0]);
try interp_argv.appendSlice(argv[1..]); try interp_argv.appendSlice(argv[1..]);
} else { } else {
return failForeign(run, "-fwasmtime", argv[0], exe); return failForeign(run, "-fwasmtime", argv[0], exe);