From 11764a1fa5ef9daaedd8fcca81e3059d78fd81fa Mon Sep 17 00:00:00 2001
From: Paul <paulsimonschaaf@gmail.com>
Date: Thu, 18 Nov 2021 03:38:26 +0100
Subject: [PATCH] cli: Add cargo args handling to verifiable builds (#1035)

---
 .gitignore     | 1 +
 cli/src/lib.rs | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 70ec3594..a3a5b152 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ docs/yarn.lock
 ts/docs/
 cli/npm-package/anchor
 cli/npm-package/*.tgz
+docker-target
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index aff677a6..e6f5e568 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -677,7 +677,7 @@ fn build_cwd(
     };
     match verifiable {
         false => _build_cwd(cfg, idl_out, idl_ts_out, cargo_args),
-        true => build_cwd_verifiable(cfg, cargo_toml, solana_version, stdout, stderr),
+        true => build_cwd_verifiable(cfg, cargo_toml, solana_version, stdout, stderr, cargo_args),
     }
 }
 
@@ -689,6 +689,7 @@ fn build_cwd_verifiable(
     solana_version: Option<String>,
     stdout: Option<File>,
     stderr: Option<File>,
+    cargo_args: Vec<String>,
 ) -> Result<()> {
     // Create output dirs.
     let workspace_dir = cfg.path().parent().unwrap().canonicalize()?;
@@ -709,6 +710,7 @@ fn build_cwd_verifiable(
         solana_version,
         stdout,
         stderr,
+        cargo_args,
     );
 
     // Wipe the generated docker-target dir.
@@ -778,6 +780,7 @@ fn docker_build(
     solana_version: Option<String>,
     stdout: Option<File>,
     stderr: Option<File>,
+    cargo_args: Vec<String>,
 ) -> Result<()> {
     let binary_name = Manifest::from_path(&cargo_toml)?.lib_name()?;
 
@@ -881,6 +884,7 @@ fn docker_build(
             "--manifest-path",
             &manifest_path.display().to_string(),
         ])
+        .args(cargo_args)
         .stdout(match stdout {
             None => Stdio::inherit(),
             Some(f) => f.into(),