Skip to content

Commit

Permalink
config: get_default_host_triple() should use from_host_or_build()
Browse files Browse the repository at this point in the history
In order to resolve an issue where installing on x86_64 with the
i686 installer would claim to want to install x86_64 and then
install i686 instead, ensure that we match the obvious behaviour
(install matching the host) by making the default for the config
match that.

Fixes: rust-lang#2179

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
  • Loading branch information
kinnison authored and BeniCheni committed May 10, 2020
1 parent 884b76e commit 7fe1ba5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ impl Cfg {
.as_ref()
.map(|s| dist::TargetTriple::new(&s)))
})?
.unwrap_or_else(dist::TargetTriple::from_build))
.unwrap_or_else(dist::TargetTriple::from_host_or_build))
}

pub fn resolve_toolchain(&self, name: &str) -> Result<String> {
Expand Down

0 comments on commit 7fe1ba5

Please sign in to comment.