commit 4533d3ebd18ea784ad2e43bc038e3332d7ab44db
author Rob Tsuk <robtsuk@google.com> Fri Feb 12 20:29:18 2021 +0000
committer Rob Tsuk <robtsuk@google.com> Fri Feb 12 20:29:18 2021 +0000
tree 3feba809b1e3df01669385187f13acd8ccc6c382
parent a85106d1382fc0ad87692b161f46922756295b3e

Add newly required argument for cmc

See http://fxrev.dev/483057.

Also added a way to get more verbose cargo output.

Change-Id: I58ac7ebdb603bcf8b2fd9f0341760f09a5405615
Reviewed-on: https://fuchsia-review.googlesource.com/c/fargo/+/484997
Reviewed-by: Dan Johnson <computerdruid@google.com>

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 096ac06..86bfab9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -578,6 +578,11 @@
 
     let pkg_path = pkg_config_path(target_options)?;
     let mut cmd = Command::new(cargo_path()?);
+
+    if options.verbose {
+        cmd.arg("-v");
+    }
+
     let sysroot_as_path = sysroot_path(target_options)?;
     let sysroot_as_str = sysroot_as_path.to_string_lossy();
 

src/package.rs

diff --git a/src/package.rs b/src/package.rs
index 46fbfd8..7840239 100644
--- a/src/package.rs
+++ b/src/package.rs
@@ -89,6 +89,7 @@
     );
 
     let cmc = cmc_path(fuchsia_config)?;
+    let fuchsia_dir = &fuchsia_dir()?;
 
     let output = Command::new(cmc)
         .arg("include")
@@ -96,7 +97,9 @@
         .arg("--output")
         .arg(&destination_path)
         .arg("--includepath")
-        .arg(&fuchsia_dir()?)
+        .arg(&fuchsia_dir)
+        .arg("--includeroot")
+        .arg(&fuchsia_dir)
         .output()
         .context("Running `cmc` to resolve includes cmx file")?;