Merge cross-rs#714

714: Use host target directory when calling host cargo. r=Emilgardis a=Alexhuszagh When using docker, the target directory is mounted at `/target`. However, when falling back to the host cargo, if we provide a custom target directory, we incorrectly pass it as `--target-dir /target`. To rectify this, this PR passes the original command-line arguments to cargo. Fixes cross-rs#619. Co-authored-by: Alex Huszagh <[email protected]> Co-authored-by: Alexander Huszagh <[email protected]>
Alexhuszagh · May 25, 2022 · c4f5ae4 · c4f5ae4
2 parents 0adbce2 + 3581476
commit c4f5ae4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- #714 - use host target directory when falling back to host cargo.
 - #713 - convert relative target directories to absolute paths.
 - #709 - Update Emscripten targets to `emcc` version 3.1.10
 - #707, #708 - Set `BINDGEN_EXTRA_CLANG_ARGS` environment variable to pass sysroot to `rust-bindgen`

diff --git a/src/main.rs b/src/main.rs
@@ -410,7 +410,10 @@ fn run() -> Result<ExitStatus> {
     }
 
     eprintln!("Warning: Falling back to `cargo` on the host.");
-    cargo::run(&args.all, verbose)
+
+    // if we fallback to the host cargo, use the same invocation that was made to cross
+    let argv: Vec<String> = env::args().skip(1).collect();
+    cargo::run(&argv, verbose)
 }
 
 #[derive(PartialEq, Debug)]