Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Stop creating an empty Modules/Setup.local file as it no longer seems to be
required to statically link the extension modules.
24 changes: 0 additions & 24 deletions Platforms/WASI/_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@

import _shared

LOCAL_SETUP_MARKER = (
b"# Generated by Platforms/WASI .\n"
b"# Required to statically build extension modules."
)

WASMTIME_VAR_NAME = "WASMTIME"
WASMTIME_HOST_RUNNER_VAR = f"{{{WASMTIME_VAR_NAME}}}"

Expand Down Expand Up @@ -147,18 +142,6 @@ def call(command, *, context=None, quiet=False, **kwargs):
@subdir("build_python_path", clean_ok=True)
def configure_build_python(context, working_dir):
"""Configure the build/host Python."""
if context.setup_local_path.exists():
if context.setup_local_path.read_bytes() == LOCAL_SETUP_MARKER:
_shared.log("👍", f"{context.setup_local_path} exists ...")
else:
_shared.log(
"⚠️",
f"{context.setup_local_path} exists, but has unexpected contents",
)
else:
_shared.log("📝", f"Creating {context.setup_local_path} ...")
context.setup_local_path.write_bytes(LOCAL_SETUP_MARKER)

configure = [os.path.relpath(context.checkout / "configure", working_dir)]
if context.args:
configure.extend(context.args)
Expand Down Expand Up @@ -300,13 +283,6 @@ def clean_contents(context):
_shared.log("🧹", f"Deleting {context.cross_build_path} ...")
shutil.rmtree(context.cross_build_path)

if context.setup_local_path.exists():
if context.setup_local_path.read_bytes() == LOCAL_SETUP_MARKER:
_shared.log(
"🧹", f"Deleting generated {context.setup_local_path} ..."
)
context.setup_local_path.unlink()


@subdir("build_python_path")
def pythoninfo_build_python(context, working_dir):
Expand Down
4 changes: 0 additions & 4 deletions Platforms/WASI/_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ def _pybuilddir(self, build_path):
relative_dir = (build_path / "pybuilddir.txt").read_text().strip()
return build_path / relative_dir

@functools.cached_property
def setup_local_path(self):
return self.checkout / "Modules" / "Setup.local"

@functools.cached_property
def host_triple(self):
if self._host_triple:
Expand Down
Loading