From 68a5e05f81b27e2e651a79fdd722889de5164d6d Mon Sep 17 00:00:00 2001
From: Jon Cinque <jon.cinque@gmail.com>
Date: Thu, 18 Aug 2022 04:52:54 +0200
Subject: [PATCH] sdk: Fix args after "--" in build-bpf and test-bpf (#27221)

---
 sdk/cargo-build-bpf/src/main.rs | 5 +++--
 sdk/cargo-test-bpf/src/main.rs  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
index 5de2742c2..0ea34f68c 100644
--- 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
index fee4dc738..af5a382fd 100644
--- 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);