Add cargo-build-bpf

Cargo.toml

@@ -53,6 +53,7 @@ members = [
     "ramp-tps",
     "runtime",
     "sdk",
+    "sdk/cargo-build-bpf",
     "scripts",
     "stake-accounts",
     "stake-monitor",

cargo-build-bpf

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+here=$(dirname "$0")
+set -x
+exec cargo run --manifest-path $here/sdk/cargo-build-bpf/Cargo.toml -- --bpf-sdk $here/sdk/bpf "$@"

ci/nits.sh

@@ -26,6 +26,7 @@ declare print_free_tree=(
   ':runtime/src/**.rs'
   ':sdk/bpf/rust/rust-utils/**.rs'
   ':sdk/**.rs'
+  ':^sdk/cargo-build-bpf/**.rs'
   ':^sdk/src/program_option.rs'
   ':^sdk/src/program_stubs.rs'
   ':programs/**.rs'

frozen-abi/Xargo.toml

@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []

programs/bpf/build.rs

@@ -94,16 +94,16 @@ fn main() {
                 program
             );
             assert!(Command::new("bash")
-                .current_dir("rust")
-                .args(&["./do.sh", "build", program])
+                .current_dir(format!("rust/{}", program))
+                .args(&["../../../../cargo-build-bpf"])
                 .status()
-                .expect("Error calling do.sh from build.rs")
+                .expect("Error calling cargo-build-bpf from build.rs")
                 .success());
             let src = format!(
-                "target/bpfel-unknown-unknown/release/solana_bpf_rust_{}.so",
+                "rust/{0}/solana_bpf_rust_{0}.so",
                 program,
             );
-            assert!(Command::new("cp")
+            assert!(Command::new("mv")
                 .arg(&src)
                 .arg(&install_dir)
                 .status()

programs/bpf/rust/128bit/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-128bit"

programs/bpf/rust/128bit_dep/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-128bit-dep"

programs/bpf/rust/alloc/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-alloc"

programs/bpf/rust/call_depth/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-call-depth"

programs/bpf/rust/custom_heap/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-custom-heap"

programs/bpf/rust/dep_crate/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-dep-crate"

programs/bpf/rust/deprecated_loader/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-deprecated_loader"

programs/bpf/rust/dup_accounts/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-dup-accounts"

programs/bpf/rust/error_handling/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-error-handling"

programs/bpf/rust/external_spend/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-external-spend"

programs/bpf/rust/instruction_introspection/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-instruction-introspection"

programs/bpf/rust/invoke/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-invoke"

programs/bpf/rust/invoked/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-invoked"

programs/bpf/rust/iter/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-iter"

programs/bpf/rust/many_args/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-many-args"

programs/bpf/rust/many_args_dep/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-many-args-dep"

programs/bpf/rust/noop/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-noop"

programs/bpf/rust/panic/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-panic"

programs/bpf/rust/param_passing/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-param-passing"

programs/bpf/rust/param_passing_dep/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-param-passing-dep"

programs/bpf/rust/rand/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-rand"

programs/bpf/rust/ristretto/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-ristretto"

programs/bpf/rust/sanity/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sanity"

programs/bpf/rust/sha256/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sha256"

programs/bpf/rust/sysval/Cargo.toml

@@ -1,5 +1,4 @@
 
-# Note: This crate must be built using do.sh
 
 [package]
 name = "solana-bpf-rust-sysval"

scripts/cargo-install-all.sh

@@ -75,6 +75,7 @@ else
 
 
   BINS=(
+    cargo-build-bpf
     solana
     solana-bench-exchange
     solana-bench-tps