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 { - 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 + // 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()