Use target_os instead of target_arch for Solana conditional compilation (#3148)

Author: dmakarov

binary-option/program/src/entrypoint.rs

@@ -1,4 +1,4 @@
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,

binary-oracle-pair/program/src/entrypoint.rs

@@ -1,6 +1,6 @@
 //! Program entrypoint definitions
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use crate::{error::PoolError, processor};
 use solana_program::{

examples/rust/custom-heap/src/entrypoint.rs

@@ -40,7 +40,7 @@ unsafe impl std::alloc::GlobalAlloc for BumpAllocator {
     }
 }
 
-#[cfg(target_arch = "bpf")]
+#[cfg(target_os = "solana")]
 #[global_allocator]
 static A: BumpAllocator = BumpAllocator;
 

feature-proposal/program/src/entrypoint.rs

@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,

governance/addin-mock/program/src/entrypoint.rs

@@ -1,5 +1,5 @@
 //! Program entrypoint
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use crate::{error::VoterWeightAddinError, processor};
 use solana_program::{

governance/chat/program/src/entrypoint.rs

@@ -1,5 +1,5 @@
 //! Program entrypoint
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use crate::{error::GovernanceChatError, processor};
 use solana_program::{

governance/program/src/entrypoint.rs

@@ -1,5 +1,5 @@
 //! Program entrypoint definitions
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use crate::{error::GovernanceError, processor};
 use solana_program::{

record/program/src/entrypoint.rs

@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,

stake-pool/program/src/entrypoint.rs

@@ -1,6 +1,6 @@
 //! Program entrypoint
 
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use {
     crate::{error::StakePoolError, processor::Processor},

stateless-asks/program/src/entrypoint.rs

@@ -1,4 +1,4 @@
-#![cfg(all(target_arch = "bpf", not(feature = "no-entrypoint")))]
+#![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))]
 
 use solana_program::{
     account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,