Merge pull request #2558 from mejrs/cargo

Call the right cargo binary
PyO3 · Aug 25, 2022 · f927cdb · f927cdb
2 parents 611ecc1 + abb2787
commit f927cdb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/xtask/src/doc.rs b/xtask/src/doc.rs
@@ -17,7 +17,7 @@ pub fn run(opts: DocOpts) -> anyhow::Result<()> {
 
     std::env::set_var("RUSTDOCFLAGS", flags.join(" "));
     cli::run(
-        Command::new("cargo")
+        Command::new(concat!(env!("CARGO_HOME"), "/bin/cargo"))
             .args(if opts.stable { None } else { Some("+nightly") })
             .arg("doc")
             .arg("--lib")

diff --git a/xtask/src/test.rs b/xtask/src/test.rs
@@ -37,7 +37,7 @@ pub fn run() -> anyhow::Result<()> {
 
     // Test MSRV
     cli::run(
-        Command::new("cargo")
+        Command::new(concat!(env!("CARGO_HOME"), "/bin/cargo"))
             .arg(format!("+{}", MSRV))
             .arg("test")
             .arg("--no-default-features")
@@ -54,7 +54,7 @@ pub fn run() -> anyhow::Result<()> {
     )?;
 
     cli::run(
-        Command::new("cargo")
+        Command::new(concat!(env!("CARGO_HOME"), "/bin/cargo"))
             .arg("+nightly")
             .arg("test")
             .arg("--no-default-features")