diff options
| author | bors <bors@rust-lang.org> | 2020-01-24 08:32:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-24 08:32:10 +0000 |
| commit | dee12bb2b7d75cce8fc8f21b5d7ea0da920df5e5 (patch) | |
| tree | 3f0255955f4d43f524452b720ab33e6e64825836 /src/librustc_codegen_ssa | |
| parent | 62f227b3f822a27bd603acede9137bfb49ca8b68 (diff) | |
| parent | 7f8a61d96c5a628ffb88304eb84a85140479ecad (diff) | |
| download | rust-dee12bb2b7d75cce8fc8f21b5d7ea0da920df5e5.tar.gz rust-dee12bb2b7d75cce8fc8f21b5d7ea0da920df5e5.zip | |
Auto merge of #68506 - tmandry:rollup-kz9d33v, r=tmandry
Rollup of 7 pull requests Successful merges: - #68424 (Suggest borrowing `Vec<NonCopy>` in for loop) - #68438 (Account for non-types in substs for opaque type error messages) - #68469 (Avoid overflow in `std::iter::Skip::count`) - #68473 (Enable ASan on Fuchsia) - #68479 (Implement `unused_parens` for block return values) - #68483 (Add my (@flip1995) name to .mailmap) - #68500 (Clear out std, not std tools) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/link.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs index 53ee5996432..f56a4170c0a 100644 --- a/src/librustc_codegen_ssa/back/link.rs +++ b/src/librustc_codegen_ssa/back/link.rs @@ -777,7 +777,7 @@ fn link_sanitizer_runtime(sess: &Session, crate_type: config::CrateType, linker: linker.args(&["-Wl,-rpath".into(), "-Xlinker".into(), rpath.into()]); linker.link_dylib(Symbol::intern(&libname)); } - "x86_64-unknown-linux-gnu" => { + "x86_64-unknown-linux-gnu" | "x86_64-fuchsia" | "aarch64-fuchsia" => { let filename = format!("librustc_rt.{}.a", name); let path = default_tlib.join(&filename); linker.link_whole_rlib(&path); |