From: Christian Heimes <christian@python.org>
Date: Tue, 14 Jun 2022 10:15:13 +0000 (+0200)
Subject: gh-90473: Include stdlib dir in wasmtime PYTHONPATH (GH-93797)
X-Git-Tag: v3.12.0a1~1270
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd543d0bc9aacca1dee02dea7ff4aec8966dcaf8;p=thirdparty%2FPython%2Fcpython.git

gh-90473: Include stdlib dir in wasmtime PYTHONPATH (GH-93797)
---

diff --git a/configure b/configure
index fb510267b69f..8da0181ef3c1 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 ca1b2528f887..c207a814fcf3 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