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

Apply #![feature(proc_macro_hygiene)] when needed

Browse Source 
This allows the rust-bpf-builder toolchain to build the sdk
This commit is contained in:
Aaron Hill
2020-07-14 14:06:01 -04:00
committed by Michael Vines
parent e7387f60a7
commit 95490ff56e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sdk/build.rs
View File

@@ -17,6 +17,11 @@ fn main() {
} }
Channel::Dev => { Channel::Dev => {
println!("cargo:rustc-cfg=RUSTC_WITH_SPECIALIZATION"); println!("cargo:rustc-cfg=RUSTC_WITH_SPECIALIZATION");
// See https://github.com/solana-labs/solana/issues/11055
// We may be running the custom `rust-bpf-builder` toolchain,
// which currently needs `#![feature(proc_macro_hygiene)]` to
// be applied.
println!("cargo:rustc-cfg=RUSTC_NEEDS_PROC_MACRO_HYGIENE");
} }
} }
} }

1
sdk/src/lib.rs
View File

@@ -1,4 +1,5 @@
#![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(specialization))] #![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(specialization))]
#![cfg_attr(RUSTC_NEEDS_PROC_MACRO_HYGIENE, feature(proc_macro_hygiene))]
// Allows macro expansion of `use ::solana_sdk::*` to work within this crate // Allows macro expansion of `use ::solana_sdk::*` to work within this crate
extern crate self as solana_sdk; extern crate self as solana_sdk;