merkle-tree: Use matches crate when targeting eBPF

(cherry picked from commit a44c326)
solana-labs · Apr 5, 2021 · 141f1b2 · 141f1b2
1 parent d61a067
commit 141f1b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml
@@ -13,6 +13,10 @@ edition = "2018"
 solana-program = { path = "../sdk/program", version = "=1.6.5" }
 fast-math = "0.1"
 
+# This can go once the BPF toolchain target Rust 1.42.0+
+[target.bpfel-unknown-unknown.dependencies]
+matches = "0.1.8"
+
 [dev-dependencies]
 hex = "0.4.2"
 

diff --git a/merkle-tree/src/lib.rs b/merkle-tree/src/lib.rs
@@ -1,3 +1,8 @@
 #![allow(clippy::integer_arithmetic)]
+
+#[cfg(target_arch = "bpf")]
+#[macro_use]
+extern crate matches;
+
 pub mod merkle_tree;
 pub use merkle_tree::MerkleTree;