sdk: Fix args after "--" in build-bpf and test-bpf (backport #27221) (#…

…27225) sdk: Fix args after "--" in build-bpf and test-bpf (#27221) (cherry picked from commit 68a5e05) Co-authored-by: Jon Cinque <[email protected]>
solana-labs · Aug 18, 2022 · 1123d58 · 1123d58
1 parent ae7a76c
commit 1123d58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
@@ -26,8 +26,9 @@ fn main() {
             args.remove(0);
         }
     }
-    args.push("--arch".to_string());
-    args.push("bpf".to_string());
+    let index = args.iter().position(|x| x == "--").unwrap_or(args.len());
+    args.insert(index, "bpf".to_string());
+    args.insert(index, "--arch".to_string());
     print!("cargo-build-bpf child: {}", program.display());
     for a in &args {
         print!(" {}", a);

diff --git a/sdk/cargo-test-bpf/src/main.rs b/sdk/cargo-test-bpf/src/main.rs
@@ -32,8 +32,9 @@ fn main() {
             args.remove(0);
         }
     }
-    args.push("--arch".to_string());
-    args.push("bpf".to_string());
+    let index = args.iter().position(|x| x == "--").unwrap_or(args.len());
+    args.insert(index, "bpf".to_string());
+    args.insert(index, "--arch".to_string());
     print!("cargo-test-bpf child: {}", program.display());
     for a in &args {
         print!(" {}", a);