Merge pull request #2186 from kinnison/installer-default-host-consistency

kinnison · web-flow · commit 991e56e4a429 · 2020-01-14T21:14:48.000Z
config: get_default_host_triple() should use from_host_or_build()
diff --git a/src/config.rs b/src/config.rs
@@ -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> {

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ impl Cfg {`
`666`	`666`	`.as_ref()`
`667`	`667`	`.map(\|s\| dist::TargetTriple::new(&s)))`
`668`	`668`	`})?`
`669`		`- .unwrap_or_else(dist::TargetTriple::from_build))`
	`669`	`+ .unwrap_or_else(dist::TargetTriple::from_host_or_build))`
`670`	`670`	`}`
`671`	`671`
`672`	`672`	`pub fn resolve_toolchain(&self, name: &str) -> Result<String> {`