Skip to content

Commit

Permalink
Auto merge of #5606 - vramana:fix/cargo-install, r=alexcrichton
Browse files Browse the repository at this point in the history
`cargo install` will ignore the target triple specified in a project directory

Fixes #5441
  • Loading branch information
bors committed Jun 27, 2018
2 parents e511e15 + 1bad991 commit 561beb2
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/bin/cargo/commands/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ continuous integration systems.",
pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
let mut compile_opts = args.compile_options(config, CompileMode::Build)?;
compile_opts.build_config.release = !args.is_present("debug");
// We override target architecture to host architecture since it may be
// set to some other architecture in .cargo/config.
compile_opts.build_config.requested_target = None;

let krates = args.values_of("crate")
.unwrap_or_default()
Expand Down
32 changes: 32 additions & 0 deletions tests/testsuite/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1606,3 +1606,35 @@ fn git_repo_replace() {
.contains(&format!("{}", new_rev))
);
}

#[test]
fn install_with_non_existent_target() {
pkg("bar", "0.0.1");

let p = project("foo")
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
authors = []
"#,
)
.file(
".cargo/config",
r#"
[build]
target = "non-existing-target"
"#,
)
.file("src/main.rs", "fn main() {}")
.build();

assert_that(
cargo_process("install").arg("bar").cwd(p.root()),
execs().with_status(0),
);
assert_that(cargo_home(), has_installed_exe("bar"));
}

0 comments on commit 561beb2

Please sign in to comment.