From c3df8b185b2832303b6989b18879cd8236fe594e Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sun, 24 Nov 2019 16:30:15 +0100 Subject: [PATCH] Rustup to rustc 1.41.0-nightly (0c987c5c0 2019-11-23) --- src/constant.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/constant.rs b/src/constant.rs index e0d3a873f7c..1f0a39540d1 100644 --- a/src/constant.rs +++ b/src/constant.rs @@ -356,7 +356,12 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut Module, cx: &mu // Don't push a `TodoItem::Static` here, as it will cause statics used by // multiple crates to be duplicated between them. It isn't necessary anyway, // as it will get pushed by `codegen_static` when necessary. - data_id_for_static(tcx, module, def_id, Linkage::Import) + data_id_for_static( + tcx, + module, + def_id, + crate::linkage::get_static_ref_linkage(tcx, def_id), + ) } };