FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.15] Improve error messages when the WASI SDK can't be found (GH-149508) by miss-islington · Pull Request #149519 · python/cpython · GitHub

Repository navigation

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
17 changes: 12 additions & 5 deletions Platforms/WASI/_build.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,8 @@ def wasi_sdk(context):
if wasi_sdk_path := context.wasi_sdk_path:
if not wasi_sdk_path.exists():
raise ValueError(
"WASI SDK not found; "
"download from "
"https://github.com/WebAssembly/wasi-sdk and/or "
"specify via $WASI_SDK_PATH or --wasi-sdk"
"WASI SDK not found at "
f"{os.fsdecode(wasi_sdk_path)!r} (via --wasi-sdk)"
)
return wasi_sdk_path

Expand All @@ -237,7 +235,8 @@ def wasi_sdk(context):
wasi_sdk_path = pathlib.Path(wasi_sdk_path_env_var)
if not wasi_sdk_path.exists():
raise ValueError(
f"WASI SDK not found at $WASI_SDK_PATH ({wasi_sdk_path})"
f"WASI SDK not found at {os.fsdecode(wasi_sdk_path)!r} "
"(via $WASI_SDK_PATH)"
)
else:
opt_path = pathlib.Path("/opt")
Expand Down Expand Up @@ -272,6 +271,14 @@ def wasi_sdk(context):
f" Found WASI SDK {major_version}, "
f"but WASI SDK {wasi_sdk_version} is the supported version",
)
elif not wasi_sdk_path:
raise ValueError(
f"WASI SDK {wasi_sdk_version} not found; "
"download from "
"https://github.com/WebAssembly/wasi-sdk and install in "
f"{os.fsdecode(opt_path)!r} or specify the SDK via "
"$WASI_SDK_PATH or --wasi-sdk"
)

# Cache the result.
context.wasi_sdk_path = wasi_sdk_path
Expand Down
Loading

Back | FazBrowse Home | New Git URL