Skip to content

GH-160135: Make sure the target triple makes it through configure #160739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brettcannon wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −7
Open

GH-160135: Make sure the target triple makes it through configure #160739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions Lib/test/test_io/test_fileio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,10 +565,15 @@ def testAbles(self):
self.assertEqual(f.writable(), True)
if sys.platform != "darwin" and \
'bsd' not in sys.platform and \
not sys.platform.startswith(('sunos', 'aix')):
# Somehow /dev/tty appears seekable on some BSDs
not sys.platform.startswith(('sunos', 'aix')) and \
not is_wasi:
# Somehow /dev/tty appears seekable on some BSDs and
# WASI.
self.assertEqual(f.seekable(), False)
self.assertEqual(f.isatty(), True)
if not is_wasi:
# wasi-libc special-cases stdin to be a TTY, but
# nothing else is supported.
self.assertEqual(f.isatty(), True)
f.close()
finally:
os.unlink(TESTFN)
Expand Down
12 changes: 8 additions & 4 deletions Platforms/WASI/_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,9 @@ def wasi_sdk_env(context):
for env_var, binary_name in list(env.items()):
env[env_var] = os.fsdecode(wasi_sdk_path / "bin" / binary_name)

if not wasi_sdk_path.name.startswith("wasi-sdk"):
for compiler in ["CC", "CPP", "CXX"]:
for compiler in ["CC", "CPP", "CXX"]:
env[compiler] += f" --target={context.host_triple}"
if not wasi_sdk_path.name.startswith("wasi-sdk"):
env[compiler] += f" --sysroot={sysroot}"

env["PKG_CONFIG_PATH"] = ""
Expand Down Expand Up @@ -229,7 +230,11 @@ def configure_wasi_python(context, working_dir):
"https://github.com/bytecodealliance/wasmtime"
)
host_runner = context.host_runner.format_map(args)
env_additions = {"CONFIG_SITE": config_site, "HOSTRUNNER": host_runner}
env_additions = {
"CONFIG_SITE": config_site,
"HOSTRUNNER": host_runner,
"CFLAGS": f"{os.environ.get('CFLAGS', '')} -DPY_CALL_TRAMPOLINE".strip(),
}
build_python = os.fsdecode(context.build_python_interpreter)
# The path to `configure` MUST be relative, else `python.wasm` is unable
# to find the stdlib due to Python not recognizing that it's being
Expand All @@ -239,7 +244,6 @@ def configure_wasi_python(context, working_dir):
f"--host={context.host_triple}",
f"--build={context.build_python_path.name}",
f"--with-build-python={build_python}",
"CFLAGS=-DPY_CALL_TRAMPOLINE",
]
if context.is_debug:
configure.append("--with-pydebug")
Expand Down
Loading