Skip to content

Commit

Permalink
remove host & target attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
Freax13 committed Apr 12, 2020
1 parent f9f62ff commit 5a051eb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions src/cargo/core/compiler/compilation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ pub struct Compilation<'cfg> {
/// Flags to pass to rustdoc when invoked from cargo test, per package.
pub rustdocflags: HashMap<PackageId, Vec<String>>,

pub host: String,
pub target: String,

config: &'cfg Config,

/// Rustc process to be used by default
Expand Down Expand Up @@ -129,8 +126,6 @@ impl<'cfg> Compilation<'cfg> {
rustc_process: rustc,
rustc_workspace_wrapper_process,
primary_rustc_process,
host: bcx.host_triple().to_string(),
target: bcx.target_data.short_name(&default_kind).to_string(),
target_runner: target_runner(bcx, default_kind)?,
})
}
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ fn run_doc_tests(
let mut runtool: &Option<(std::path::PathBuf, Vec<String>)> = &None;
if doctest_xcompile {
runtool = compilation.target_runner();
} else if compilation.host != compilation.target {
} else if options.compile_opts.build_config.requested_kind.is_host() {
return Ok((Test::Doc, errors));
}

Expand Down

0 comments on commit 5a051eb

Please sign in to comment.