Skip to content

Commit

Permalink
Update wasm linker (#1632)
Browse files Browse the repository at this point in the history
* Update wasm linker

* Update workflows to trigger on cargo changes

* conditionally set linker

* move to bindings wasm builld script

* lint

---------

Co-authored-by: Ry Racherbaumer <[email protected]>
  • Loading branch information
codabrink and rygine authored Feb 18, 2025
1 parent aa17fca commit ece46c7
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/lint-node-bindings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
- "bindings_node/**"
- ".github/workflows/lint-node-bindings.yaml"
- "rustfmt.toml"
- "Cargo.toml"
- "Cargo.lock"
- ".cargo/**"
- "rust-toolchain"
jobs:
lint:
name: Lint
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/lint-wasm-bindings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
- "bindings_wasm/**"
- ".github/workflows/lint-wasm-bindings.yaml"
- "rustfmt.toml"
- "Cargo.toml"
- "Cargo.lock"
- ".cargo/**"
- "rust-toolchain"
env:
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
- "bindings_ffi/**"
- "Cargo.toml"
- "Cargo.lock"
- ".cargo/**"
- "rust-toolchain"
- "rustfmt.toml"
env:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-ffi-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
- "xmtp_v2/**"
- "Cargo.toml"
- "Cargo.lock"
- ".cargo/**"
- "rust-toolchain"
env:
CARGO_TERM_COLOR: always
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-http-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- "xmtp_v2/**"
- "Cargo.toml"
- "Cargo.lock"
- ".cargo/**"
- "rust-toolchain"
env:
CARGO_TERM_COLOR: always
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-node-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:
- ".node-version"
- "Cargo.toml"
- "Cargo.lock"
- ".cargo/**"
- "rust-toolchain"

jobs:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-webassembly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- "xmtp_proto/**"
- "Cargo.toml"
- "Cargo.lock"
- ".cargo/**"
- "rust-toolchain"
env:
CARGO_TERM_COLOR: always
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-workspace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- "xmtp_v2/**"
- "Cargo.toml"
- "Cargo.lock"
- ".cargo/**"
- "rust-toolchain"
env:
CARGO_TERM_COLOR: always
Expand Down
7 changes: 7 additions & 0 deletions bindings_wasm/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
fn main() {
let target = std::env::var("TARGET").unwrap_or_default();
if cfg!(target_os = "macos") && target == "wasm32-unknown-unknown" {
println!("cargo:rustc-link-arg=--linker=wasm-ld");
println!("cargo:rustc-env=CC_wasm32-unknown-unknown=/opt/homebrew/opt/llvm/bin/clang");
}
}

0 comments on commit ece46c7

Please sign in to comment.