Merge #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 #619.

Co-authored-by: Alex Huszagh <[email protected]>
Co-authored-by: Alexander Huszagh <[email protected]>

Author: bors[bot]

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`

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)]