Skip to content

Commit ece46c7

Browse files
codabrinkrygine
andauthored
Update wasm linker (#1632)
* 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 <ry@xmtp.com>
1 parent aa17fca commit ece46c7

9 files changed

+21
-0
lines changed

.github/workflows/lint-node-bindings.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
- "bindings_node/**"
66
- ".github/workflows/lint-node-bindings.yaml"
77
- "rustfmt.toml"
8+
- "Cargo.toml"
9+
- "Cargo.lock"
10+
- ".cargo/**"
11+
- "rust-toolchain"
812
jobs:
913
lint:
1014
name: Lint

.github/workflows/lint-wasm-bindings.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on:
55
- "bindings_wasm/**"
66
- ".github/workflows/lint-wasm-bindings.yaml"
77
- "rustfmt.toml"
8+
- "Cargo.toml"
9+
- "Cargo.lock"
10+
- ".cargo/**"
11+
- "rust-toolchain"
812
env:
913
CARGO_TERM_COLOR: always
1014
CARGO_INCREMENTAL: 0

.github/workflows/lint-workspace.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919
- "bindings_ffi/**"
2020
- "Cargo.toml"
2121
- "Cargo.lock"
22+
- ".cargo/**"
2223
- "rust-toolchain"
2324
- "rustfmt.toml"
2425
env:

.github/workflows/test-ffi-bindings.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
- "xmtp_v2/**"
1919
- "Cargo.toml"
2020
- "Cargo.lock"
21+
- ".cargo/**"
2122
- "rust-toolchain"
2223
env:
2324
CARGO_TERM_COLOR: always

.github/workflows/test-http-api.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
- "xmtp_v2/**"
1818
- "Cargo.toml"
1919
- "Cargo.lock"
20+
- ".cargo/**"
2021
- "rust-toolchain"
2122
env:
2223
CARGO_TERM_COLOR: always

.github/workflows/test-node-bindings.yml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ on:
2121
- ".node-version"
2222
- "Cargo.toml"
2323
- "Cargo.lock"
24+
- ".cargo/**"
2425
- "rust-toolchain"
2526

2627
jobs:

.github/workflows/test-webassembly.yml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- "xmtp_proto/**"
1414
- "Cargo.toml"
1515
- "Cargo.lock"
16+
- ".cargo/**"
1617
- "rust-toolchain"
1718
env:
1819
CARGO_TERM_COLOR: always

.github/workflows/test-workspace.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
- "xmtp_v2/**"
1818
- "Cargo.toml"
1919
- "Cargo.lock"
20+
- ".cargo/**"
2021
- "rust-toolchain"
2122
env:
2223
CARGO_TERM_COLOR: always

bindings_wasm/build.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
fn main() {
2+
let target = std::env::var("TARGET").unwrap_or_default();
3+
if cfg!(target_os = "macos") && target == "wasm32-unknown-unknown" {
4+
println!("cargo:rustc-link-arg=--linker=wasm-ld");
5+
println!("cargo:rustc-env=CC_wasm32-unknown-unknown=/opt/homebrew/opt/llvm/bin/clang");
6+
}
7+
}

0 commit comments

Comments
 (0)