Force a recent version of the openssl crate to allow this to build on M1 macs (backport #21008) (#21012)

* Force a recent version of the openssl crate to allow this to build on M1 macs

(cherry picked from commit 920159fc63)

# Conflicts:
#	Cargo.lock
#	programs/bpf_loader/Cargo.toml

* Run cargo check

(cherry picked from commit 8efc577374)

# Conflicts:
#	programs/bpf/Cargo.lock

* Resolve merge conflicts

Co-authored-by: Matt Wilde <matthewcwilde@gmail.com>
Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2021-10-27 02:55:49 +00:00
committed by GitHub
parent 0a698fc48f
commit 5dd00e9230
3 changed files with 16 additions and 13 deletions

View File

@@ -17,6 +17,7 @@ num-derive = "0.3"
num-traits = "0.2"
rand_core = "0.6.2"
libsecp256k1 = "0.5.0"
openssl = "^0.10.36"
sha3 = "0.9.1"
solana-measure = { path = "../../measure", version = "=1.8.2" }
solana-runtime = { path = "../../runtime", version = "=1.8.2" }