gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Quash M1 build warning

Browse Source 
(cherry picked from commit e31b469f56)

# Conflicts:
#	ledger/src/builtins.rs
This commit is contained in:
Michael Vines
2021-11-29 19:34:56 -08:00
parent b1bf420524
commit 713b61677e
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ledger/src/builtins.rs
View File

@@ -1,8 +1,15 @@
<<<<<<< HEAD
use solana_runtime::{ use solana_runtime::{
bank::{Builtin, Builtins}, bank::{Builtin, Builtins},
builtins::ActivationType, builtins::ActivationType,
}; };
use solana_sdk::{feature_set, pubkey::Pubkey}; use solana_sdk::{feature_set, pubkey::Pubkey};
=======
use {
solana_runtime::builtins::{ActivationType, Builtin, Builtins},
solana_sdk::pubkey::Pubkey,
};
>>>>>>> e31b469f5 (Quash M1 build warning)
macro_rules! to_builtin { macro_rules! to_builtin {
($b:expr) => { ($b:expr) => {
@@ -16,7 +23,12 @@ fn genesis_builtins(bpf_jit: bool) -> Vec<Builtin> {
// !x86_64: https://github.com/qmonnet/rbpf/issues/48 // !x86_64: https://github.com/qmonnet/rbpf/issues/48
// Windows: https://github.com/solana-labs/rbpf/issues/217 // Windows: https://github.com/solana-labs/rbpf/issues/217
#[cfg(any(not(target_arch = "x86_64"), target_family = "windows"))] #[cfg(any(not(target_arch = "x86_64"), target_family = "windows"))]
let bpf_jit = false; let bpf_jit = {
if bpf_jit {
info!("BPF JIT is not supported on this target");
}
false
};
vec![ vec![
to_builtin!(solana_bpf_loader_deprecated_program!()), to_builtin!(solana_bpf_loader_deprecated_program!()),