diff options
| author | bors <bors@rust-lang.org> | 2019-12-12 19:52:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-12 19:52:27 +0000 |
| commit | 3eeb8d4f2fbae0bb1c587d00b5abeaf938da47f4 (patch) | |
| tree | b34847e50618034373a8cea277b59839733e96da /src/bootstrap/lib.rs | |
| parent | e9469a6aec2f49fa1e2ae670649f293866932253 (diff) | |
| parent | 786b9d0d626dfbf97e64cd113bbcca08f65c3ca9 (diff) | |
| download | rust-3eeb8d4f2fbae0bb1c587d00b5abeaf938da47f4.tar.gz rust-3eeb8d4f2fbae0bb1c587d00b5abeaf938da47f4.zip | |
Auto merge of #67172 - jethrogb:jb/bootstrap-linker, r=alexcrichton
Bootstrap: change logic for choosing linker and rpath This is a follow-up from #66957 and #67023. Apparently there was one more location with a hard-coded list of targets to influence linking. I've filed #67171 to track this madness. r? @alexcrichton
Diffstat (limited to 'src/bootstrap/lib.rs')
| -rw-r--r-- | src/bootstrap/lib.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 1f4a4f923e0..7f7e29108a8 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -805,12 +805,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 |