mirror of
https://codeberg.org/ziglang/zig.git
synced 2026-04-27 19:09:47 +03:00
Fix -fwasmtime not inheriting environment variables
This commit is contained in:
committed by
Andrew Kelley
parent
0bbf0461d9
commit
3d48264365
@@ -1323,24 +1323,11 @@ fn runCommand(
|
||||
},
|
||||
.wasmtime => |bin_name| {
|
||||
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("--dir=.");
|
||||
try interp_argv.append("--");
|
||||
// Wasmtime doeesn't inherit environment variables from the parent process
|
||||
// by default. '-S inherit-env' was added in Wasmtime version 20.
|
||||
try interp_argv.append("-Sinherit-env");
|
||||
try interp_argv.append(argv[0]);
|
||||
try interp_argv.appendSlice(argv[1..]);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user