Build with wasm exception handling

pyodide_build/buildall.py

@@ -30,9 +30,10 @@
 from rich.table import Table
 
 from pyodide_build import build_env, recipe
-from pyodide_build.build_env import BuildArgs
+from pyodide_build.build_env import BuildArgs, get_pyodide_root
 from pyodide_build.buildpkg import needs_rebuild
 from pyodide_build.common import (
+    download_and_unpack_archive,
     exit_with_stdio,
     extract_wheel_metadata_file,
     find_matching_wheels,
@@ -649,22 +650,18 @@ def run(self, n_jobs: int, already_built: set[str]) -> None:
 
 
 def _ensure_rust_toolchain():
-    rust_toolchain = build_env.get_build_flag("RUST_TOOLCHAIN")
+    toolchain_version = build_env.get_build_flag("RUST_TOOLCHAIN")
+    pyodide_root = get_pyodide_root()
+    toolchain_path = pyodide_root / ".rust-toolchain" / toolchain_version
+    if not toolchain_path.exists():
+        download_and_unpack_archive(
+            f"http://pyodide-cache.s3-website-us-east-1.amazonaws.com/rustc/{toolchain_version}.tar.bz2",
+            toolchain_path.parent,
+            "rust toolchain",
+        )
     result = subprocess.run(
-        ["rustup", "toolchain", "install", rust_toolchain], check=False
+        ["rustup", "toolchain", "link", toolchain_version, toolchain_path], check=False
     )
-    if result.returncode == 0:
-        result = subprocess.run(
-            [
-                "rustup",
-                "target",
-                "add",
-                "wasm32-unknown-emscripten",
-                "--toolchain",
-                rust_toolchain,
-            ],
-            check=False,
-        )
     if result.returncode != 0:
         logger.error("ERROR: rustup toolchain install failed")
         exit_with_stdio(result)

pyodide_build/config.py

@@ -207,7 +207,7 @@ def to_env(self) -> dict[str, str]:
     "rustflags": "-C link-arg=-sSIDE_MODULE=2 -C link-arg=-sWASM_BIGINT -Z link-native-libraries=no",
     "cargo_build_target": "wasm32-unknown-emscripten",
     "cargo_target_wasm32_unknown_emscripten_linker": "emcc",
-    "rust_toolchain": "nightly-2024-01-29",
+    "rust_toolchain": "emscripten_2025-01-13_724fd8dedf1",
     # Other configuration
     "pyodide_jobs": "1",
     "skip_emscripten_version_check": "0",

pyodide_build/pywasmcross.py

@@ -118,6 +118,9 @@ def replay_genargs_handle_dashl(arg: str, used_libs: set[str]) -> str | None:
     if arg == "-lgfortran":
         return None
 
+    if arg in ["-lfreetype", "-lpng"]:
+        arg += "-wasm-sjlj"
+
     # WASM link doesn't like libraries being included twice
     # skip second one
     if arg in used_libs:
@@ -578,7 +581,10 @@ def handle_command_generate_args(  # noqa: C901
     # Better to fail at compile or link time.
     if is_link_cmd(line):
         new_args.append("-Wl,--fatal-warnings")
-        new_args.extend(build_args.ldflags.split())
+        for arg in build_args.ldflags.split():
+            if arg.startswith("-l"):
+                arg = replay_genargs_handle_dashl(arg, used_libs)
+            new_args.append(arg)
         new_args.extend(get_export_flags(line, build_args.exports))
 
     if "-c" in line:

pyproject.toml

@@ -133,7 +133,7 @@ lint.select = [
 
 lint.logger-objects = ["pyodide_build.logger.logger"]
 
-lint.ignore = ["E402", "E501", "E731", "E741", "PERF401", "PLW2901", "UP038"]
+lint.ignore = ["E402", "E501", "E731", "E741", "PERF401", "PLW2901", "UP038", "PLR0912"]
 # line-length = 219  # E501: Recommended goal is 88 to match black
 target-version = "py312"