bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Address review comments for #53031 and fix some merge fallout.

Browse source
This commit is contained in:
Michael Woerister 2018-08-06 11:16:28 +02:00
parent b27a161939
commit 3a70050377
6 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_codegen_llvm/back/write.rs
View file

@ -2385,7 +2385,7 @@ fn msvc_imps_needed(tcx: TyCtxt) -> bool {
tcx.sess.opts.cg.prefer_dynamic));
tcx.sess.target.target.options.is_like_msvc &&
tcx.sess.crate_types.borrow().iter().any(|ct| *ct == config::CrateTypeRlib) &&
tcx.sess.crate_types.borrow().iter().any(|ct| *ct == config::CrateType::Rlib) &&
// ThinLTO can't handle this workaround in all cases, so we don't
// emit the `__imp_` symbols. Instead we make them unnecessary by disallowing
// dynamic linking when cross-language LTO is enabled.