From 2dc36f9dcdf23356109674647b89ebe9cc1b6142 Mon Sep 17 00:00:00 2001
From: Viktor Sonesten <v@tmplt.dev>
Date: Wed, 16 Jun 2021 11:34:44 +0200
Subject: [PATCH] building: dirtily fix call into cargo-config until feat
 stability

Revert this issue when <https://github.com/rust-lang/cargo/issues/9301> stabilizes.
---
 cargo-rtic-trace/src/building.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cargo-rtic-trace/src/building.rs b/cargo-rtic-trace/src/building.rs
index 88d59a3..51fdd3b 100644
--- a/cargo-rtic-trace/src/building.rs
+++ b/cargo-rtic-trace/src/building.rs
@@ -18,7 +18,13 @@ pub struct CargoWrapper {
 impl CargoWrapper {
     /// Checks if cargo exists in PATH and returns it wrapped in a Command.
     fn cmd() -> Result<Command> {
-        let cargo = env::var_os("CARGO").unwrap_or_else(|| "cargo".into());
+        // XXX cargo sets CARGO to an absolute
+        // ~/.rustup/toolchains/.../bin/cargo when starting a
+        // sub-command. Until
+        // <https://github.com/rust-lang/cargo/issues/9301> is
+        // stabilized, we need to call into +nightly for cargo-config.
+        // So for now we'll disregard it.
+        let cargo = "cargo"; // env::var_os("CARGO").unwrap_or_else(|| "cargo".into());
         let mut cargo = Command::new(cargo);
         let _output = cargo
             .output()