Add --bpf-out-dir argument to control where the final build products land

programs/bpf/build.rs

@@ -57,13 +57,6 @@ fn main() {
         let install_dir =
             "target/".to_string() + &env::var("PROFILE").unwrap() + &"/bpf".to_string();
 
-        assert!(Command::new("mkdir")
-            .arg("-p")
-            .arg(&install_dir)
-            .status()
-            .expect("Unable to create BPF install directory")
-            .success());
-
         let rust_programs = [
             "128bit",
             "alloc",
@@ -93,22 +86,16 @@ fn main() {
                 "cargo:warning=(not a warning) Building Rust-based BPF programs: solana_bpf_rust_{}",
                 program
             );
-            assert!(Command::new("bash")
-                .current_dir(format!("rust/{}", program))
-                .args(&["../../../../cargo-build-bpf"])
+            assert!(Command::new("../../cargo-build-bpf")
+                .args(&[
+                    "--manifest-path",
+                    &format!("rust/{}/Cargo.toml", program),
+                    "--bpf-out-dir",
+                    &install_dir
+                ])
                 .status()
                 .expect("Error calling cargo-build-bpf from build.rs")
                 .success());
-            let src = format!(
-                "rust/{0}/solana_bpf_rust_{0}.so",
-                program,
-            );
-            assert!(Command::new("mv")
-                .arg(&src)
-                .arg(&install_dir)
-                .status()
-                .unwrap_or_else(|_| panic!("Failed to cp {} to {}", src, install_dir))
-                .success());
         }
 
         rerun_if_changed(&[], &["rust", "../../sdk", &install_dir], &["/target/"]);