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

Update paths

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-02 21:23:04 -07:00
committed by Grimes
parent 9923c543e8
commit 44322124c8
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
programs/bpf_loader/build.rs
View File

@@ -37,20 +37,16 @@ fn main() {
rerun_if_changed( rerun_if_changed(
&[ &[
"../../../sdk/bpf/bpf.ld", "../../sdk/bpf/bpf.ld",
"../../../sdk/bpf/bpf.mk", "../../sdk/bpf/bpf.mk",
"../../bpf/c/makefile", "../bpf/c/makefile",
],
&[
"../../../sdk/bpf/inc",
"../../../sdk/bpf/scripts",
"../../bpf/c/src",
], ],
&["../../sdk/bpf/inc", "../../sdk/bpf/scripts", "../bpf/c/src"],
); );
println!("cargo:warning=(not a warning) Compiling C-based BPF programs"); println!("cargo:warning=(not a warning) Compiling C-based BPF programs");
let status = Command::new("make") let status = Command::new("make")
.current_dir("../../bpf/c") .current_dir("../bpf/c")
.arg("programs") .arg("programs")
.arg(&out_dir) .arg(&out_dir)
.status() .status()
@@ -61,10 +57,10 @@ fn main() {
let bpf_rust = !env::var("CARGO_FEATURE_BPF_RUST").is_err(); let bpf_rust = !env::var("CARGO_FEATURE_BPF_RUST").is_err();
if bpf_rust { if bpf_rust {
let install_dir = let install_dir =
"../../../../target/".to_string() + &env::var("PROFILE").unwrap() + &"/bpf".to_string(); "../../../target/".to_string() + &env::var("PROFILE").unwrap() + &"/bpf".to_string();
if !Path::new( if !Path::new(
"../../bpf/rust/noop/target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so", "../bpf/rust/noop/target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so",
) )
.is_file() .is_file()
{ {
@@ -79,19 +75,19 @@ fn main() {
rerun_if_changed( rerun_if_changed(
&[ &[
"../../bpf/rust/noop/bpf.ld", "../bpf/rust/noop/bpf.ld",
"../../bpf/rust/noop/build.sh", "../bpf/rust/noop/build.sh",
"../../bpf/rust/noop/Cargo.toml", "../bpf/rust/noop/Cargo.toml",
"../../bpf/rust/noop/target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so", "../bpf/rust/noop/target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so",
], ],
&["../../bpf/rust/noop/src"], &["../bpf/rust/noop/src"],
); );
println!( println!(
"cargo:warning=(not a warning) Installing Rust-based BPF program: solana_bpf_rust_noop" "cargo:warning=(not a warning) Installing Rust-based BPF program: solana_bpf_rust_noop"
); );
let status = Command::new("mkdir") let status = Command::new("mkdir")
.current_dir("../../bpf/rust/noop") .current_dir("../bpf/rust/noop")
.arg("-p") .arg("-p")
.arg(&install_dir) .arg(&install_dir)
.status() .status()
@@ -99,7 +95,7 @@ fn main() {
assert!(status.success()); assert!(status.success());
let status = Command::new("cp") let status = Command::new("cp")
.current_dir("../../bpf/rust/noop") .current_dir("../bpf/rust/noop")
.arg("target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so") .arg("target/bpfel-unknown-unknown/release/solana_bpf_rust_noop.so")
.arg(&install_dir) .arg(&install_dir)
.status() .status()