Commit4637a1f

authored

[3.11]GH-116313: get WASI builds to run under wasmtime 18 w/ WASI 0.2/preview2 primitives (GH-116327) (GH-116373) (GH-116384)

(cherry picked from commit88fdb08)

1 parent8675e7f commit4637a1fCopy full SHA for 4637a1f

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Get WASI builds to work under wasmtime 18 w/ WASI 0.2/preview2 primitives.`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,10 @@ def _check_wasi():`
`316`	`316`	`# workaround for https://github.com/python/cpython/issues/95952`
`317`	`317`	`"HOSTRUNNER": (`
`318`	`318`	`"wasmtime run "`
`319`		`-"--env PYTHONPATH=/{relbuilddir}/build/lib.wasi-wasm32-{version}:/Lib "`
`320`		`-"--mapdir /::{srcdir} --"`
	`319`	`+"--wasm max-wasm-stack=8388608 "`
	`320`	`+"--wasi preview2 "`
	`321`	`+"--dir {srcdir}::/ "`
	`322`	`+"--env PYTHONPATH=/{relbuilddir}/build/lib.wasi-wasm32-{version}:/Lib"`
`321`	`323`	`),`
`322`	`324`	`"PATH": [WASI_SDK_PATH/"bin",os.environ["PATH"]],`
`323`	`325`	`},`

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1580,7 +1580,7 @@ then`
`1580`	`1580`	`dnl TODO: support other WASI runtimes`
`1581`	`1581`	`dnl wasmtime starts the proces with "/" as CWD. For OOT builds add the`
`1582`	`1582`	`dnl directory containing _sysconfigdata to PYTHONPATH.`
`1583`		`-[WASI/*],[HOSTRUNNER='wasmtime run --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt) --mapdir /::$(srcdir) --'],`
	`1583`	`+[WASI/*],[HOSTRUNNER='wasmtime run --wasm max-wasm-stack=8388608 --wasi preview2 --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt):/Lib --dir$(srcdir)::/'],`
`1584`	`1584`	`[HOSTRUNNER='']`
`1585`	`1585`	`)`
`1586`	`1586`	`fi`

Comments

(0)