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

diff --git a/configure b/configure
index fb510267b69feca4ad4155a0e17d724cad248ac3..8da0181ef3c19c72dbff7e66e22c85e3e22569cb 100755 (executable)
--- 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 ca1b2528f88787db8751c3903041181af5d17102..c207a814fcf3e88fb589a7f59cec890948286076 100644 (file)
--- 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