Bootstrap: change logic for choosing linker and rpath

2019-12-09 09:46:55 +01:00
parent 2b0e6d2643
commit 786b9d0d62
3 changed files with 17 additions and 11 deletions
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -806,12 +806,8 @@ impl Build {
                                                       .and_then(|c| c.linker.as_ref()) {
            Some(linker)
        } else if target != self.config.build &&
-                  !target.contains("msvc") &&
-                  !target.contains("emscripten") &&
-                  !target.contains("wasm32") &&
-                  !target.contains("nvptx") &&
-                  !target.contains("fortanix") &&
-                  !target.contains("fuchsia") {
+                  util::use_host_linker(&target) &&
+                  !target.contains("msvc") {
            Some(self.cc(target))
        } else {
            None