[Python-checkins] gh-90473: Include stdlib dir in wasmtime PYTHONPATH (GH-93797)

Tue Jun 14 06:15:24 EDT 2022

https://github.com/python/cpython/commit/cd543d0bc9aacca1dee02dea7ff4aec8966dcaf8
commit: cd543d0bc9aacca1dee02dea7ff4aec8966dcaf8
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022年06月14日T12:15:13+02:00
summary:
gh-90473: Include stdlib dir in wasmtime PYTHONPATH (GH-93797)
files:
M configure
M configure.ac

diff --git a/configure b/configure
index fb510267b69fe..8da0181ef3c19 100755
--- a/configure
+++ b/configure
@@ -6782,7 +6782,7 @@ else
 fi
 ;; #(
 WASI/*) :
- HOSTRUNNER='wasmtime run --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt) --mapdir /::$(srcdir) --' ;; #(
+ HOSTRUNNER='wasmtime run --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt):/Lib --mapdir /::$(srcdir) --' ;; #(
 *) :
 HOSTRUNNER=''
 ;;
diff --git a/configure.ac b/configure.ac
index ca1b2528f8878..c207a814fcf3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1492,7 +1492,7 @@ then
 dnl TODO: support other WASI runtimes
 dnl wasmtime starts the proces with "/" as CWD. For OOT builds add the
 dnl directory containing _sysconfigdata to PYTHONPATH.
- [WASI/*], [HOSTRUNNER='wasmtime run --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt) --mapdir /::$(srcdir) --'],
+ [WASI/*], [HOSTRUNNER='wasmtime run --env PYTHONPATH=/$(shell realpath --relative-to $(abs_srcdir) $(abs_builddir))/$(shell cat pybuilddir.txt):/Lib --mapdir /::$(srcdir) --'],
 [HOSTRUNNER='']
 )
 fi
