rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

builder.cargo(): don't add "--target"/"--release" to cargo install

Browse Source 
This is required to use builder.cargo for cargo-vendor.
This commit is contained in:
Johannes Nixdorf
2018-05-25 14:04:27 +02:00
parent 81687c4a7f
commit ff8f226cab
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bootstrap/builder.rs
View File

@@ -698,9 +698,14 @@ impl<'a> Builder<'a> {
let out_dir = self.stage_out(compiler, mode); let out_dir = self.stage_out(compiler, mode);
cargo cargo
.env("CARGO_TARGET_DIR", out_dir) .env("CARGO_TARGET_DIR", out_dir)
.arg(cmd) .arg(cmd);
.arg("--target")
.arg(target); if cmd != "install" {
cargo.arg("--target")
.arg(target);
} else {
assert_eq!(target, compiler.host);
}
// Set a flag for `check` so that certain build scripts can do less work // Set a flag for `check` so that certain build scripts can do less work
// (e.g. not building/requiring LLVM). // (e.g. not building/requiring LLVM).
@@ -1022,8 +1027,8 @@ impl<'a> Builder<'a> {
} }
if self.config.rust_optimize { if self.config.rust_optimize {
// FIXME: cargo bench does not accept `--release` // FIXME: cargo bench/install do not accept `--release`
if cmd != "bench" { if cmd != "bench" && cmd != "install" {
cargo.arg("--release"); cargo.arg("--release");
} }
} }