Manually cherry-pick 180d58c

Author: brettcannon

Platforms/WASI/__main__.py

@@ -13,7 +13,7 @@
 
 def main():
     default_host_runner = (
-        f"{WASMTIME} run "
+        "{WASMTIME} run "
         # Set argv0 so that getpath.py can auto-discover the sysconfig data directory.
         "--argv0 {ARGV0} "
         # Map the checkout to / to load the stdlib from /Lib.

Platforms/WASI/_build.py

@@ -337,22 +337,9 @@ def configure_wasi_python(context, working_dir):
 
     wasi_build_dir = working_dir.relative_to(CHECKOUT)
 
-    python_build_dir = BUILD_DIR / "build"
-    lib_dirs = list(python_build_dir.glob("lib.*"))
-    assert len(lib_dirs) == 1, (
-        f"Expected a single lib.* directory in {python_build_dir}"
-    )
-    lib_dir = os.fsdecode(lib_dirs[0])
-    python_version = lib_dir.rpartition("-")[-1]
-    sysconfig_data_dir = (
-        f"{wasi_build_dir}/build/lib.wasi-wasm32-{python_version}"
-    )
-
-    # Use PYTHONPATH to include sysconfig data which must be anchored to the
-    # WASI guest's `/` directory.
     args = {
         "WASMTIME": "wasmtime",
-        "PYTHONPATH": f"/{sysconfig_data_dir}",
+        "ARGV0": f"/{wasi_build_dir}/python.wasm",
         "CHECKOUT": os.fsdecode(CHECKOUT),
         "WASMTIME_CONFIG_PATH": os.fsdecode(HERE / "wasmtime.toml"),
     }