Skip to content

Commit

Permalink
Support cross-compile install
Browse files Browse the repository at this point in the history
  • Loading branch information
infinity0 committed Jun 29, 2018
1 parent 3b94f44 commit 0774e97
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/bin/cargo/commands/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pub fn cli() -> App {
"Install only the specified example",
"Install all examples",
)
.arg_target_triple("Build for the target triple")
.arg(opt("root", "Directory to install packages into").value_name("DIR"))
.after_help(
"\
Expand Down
35 changes: 35 additions & 0 deletions tests/testsuite/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use std::io::prelude::*;

use cargo::util::ProcessBuilder;
use cargotest::install::{cargo_home, has_installed_exe};
use cargotest::support::cross_compile;
use cargotest::support::git;
use cargotest::support::paths;
use cargotest::support::registry::Package;
Expand Down Expand Up @@ -1334,6 +1335,40 @@ fn dev_dependencies_lock_file_untouched() {
assert!(lock == lock2, "different lockfiles");
}

#[test]
fn install_target_native() {
pkg("foo", "0.1.0");

assert_that(
cargo_process("install")
.arg("foo")
.arg("--target")
.arg(cargotest::rustc_host()),
execs()
.with_status(0),
);
assert_that(cargo_home(), has_installed_exe("foo"));
}

#[test]
fn install_target_foreign() {
if cross_compile::disabled() {
return;
}

pkg("foo", "0.1.0");

assert_that(
cargo_process("install")
.arg("foo")
.arg("--target")
.arg(cross_compile::alternate()),
execs()
.with_status(0),
);
assert_that(cargo_home(), has_installed_exe("foo"));
}

#[test]
fn vers_precise() {
pkg("foo", "0.1.1");
Expand Down

0 comments on commit 0774e97

Please sign in to comment.