Merge pull request #3358 from o1-labs/leon/wasm-macos

fix: wasm build on macOS

Author: dannywillems

.cargo/config.toml

@@ -5,4 +5,10 @@ xtask = "run --package xtask --"
 # Required to avoid undefined symbols when building dylib on MacOS
 # (e.g. required for at the time of writing).
 [target.aarch64-apple-darwin]
-rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]
+rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]
+
+[target.wasm32-unknown-unknown]
+rustflags = [
+  "-C", "target-feature=+atomics,+bulk-memory,+mutable-globals",
+  "-C", "link-arg=--max-memory=4294967296",
+]

.github/workflows/wasm.yml

@@ -10,12 +10,12 @@ on:
 jobs:
   build-wasm:
     name: Build WebAssembly code
-
-    runs-on: ["ubuntu-latest"]
-
     strategy:
       matrix:
-        rust_toolchain_version: ["nightly-2024-09-05"]
+        os: [ubuntu-latest, macos-15]
+        rust_toolchain_version: ['nightly-2024-09-05']
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout repository

plonk-wasm/config.toml

@@ -152,8 +152,6 @@ fn build_kimchi_stubs(target_dir: Option<&str>, offline: bool) -> Result<()> {
 }
 
 fn build_wasm(out_dir: &str, target: Target, rust_version: RustVersion) -> Result<()> {
-    const RUSTFLAGS: &str = "-C target-feature=+atomics,+bulk-memory,+mutable-globals -C link-arg=--max-memory=4294967296";
-
     let cargo_target_dir = env::var("CARGO_TARGET_DIR").unwrap_or_else(|_| "target".to_string());
     let artifact_dir = PathBuf::from(format!("{cargo_target_dir}/bin"));
 
@@ -204,7 +202,6 @@ fn build_wasm(out_dir: &str, target: Target, rust_version: RustVersion) -> Resul
     let status = cmd
         .args(args)
         .args(target_args)
-        .env("RUSTFLAGS", RUSTFLAGS)
         .status()
         .context("Failed to execute wasm-pack")?;