blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch to cargo-build-sbf for building tests in programs/bpf

This commit is contained in:
Dmitri Makarov 2022-08-07 18:45:50 -07:00 committed by mergify[bot]
parent 776a47bd83
commit d9f0bdf392
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/bpf/build.rs
View File

@ -41,13 +41,13 @@ fn main() {
if bpf_c { if bpf_c {
let install_dir = "OUT_DIR=../target/".to_string() + &env::var("PROFILE").unwrap() + "/bpf"; let install_dir = "OUT_DIR=../target/".to_string() + &env::var("PROFILE").unwrap() + "/bpf";
println!("cargo:warning=(not a warning) Building C-based BPF programs"); println!("cargo:warning=(not a warning) Building C-based SBF programs");
assert!(Command::new("make") assert!(Command::new("make")
.current_dir("c") .current_dir("c")
.arg("programs") .arg("programs")
.arg(&install_dir) .arg(&install_dir)
.status() .status()
.expect("Failed to build C-based BPF programs") .expect("Failed to build C-based SBF programs")
.success()); .success());
rerun_if_changed(&["c/makefile"], &["c/src", "../../sdk"], &["/target/"]); rerun_if_changed(&["c/makefile"], &["c/src", "../../sdk"], &["/target/"]);
@ -104,18 +104,18 @@ fn main() {
]; ];
for program in rust_programs.iter() { for program in rust_programs.iter() {
println!( println!(
"cargo:warning=(not a warning) Building Rust-based BPF programs: solana_bpf_rust_{}", "cargo:warning=(not a warning) Building Rust-based SBF programs: solana_bpf_rust_{}",
program program
); );
assert!(Command::new("../../cargo-build-bpf") assert!(Command::new("../../cargo-build-sbf")
.args(&[ .args(&[
"--manifest-path", "--manifest-path",
&format!("rust/{}/Cargo.toml", program), &format!("rust/{}/Cargo.toml", program),
"--bpf-out-dir", "--sbf-out-dir",
&install_dir &install_dir
]) ])
.status() .status()
.expect("Error calling cargo-build-bpf from build.rs") .expect("Error calling cargo-build-sbf from build.rs")
.success()); .success());
} }