about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDenis Merigoux <denis.merigoux@gmail.com>2018-09-06 10:23:42 -0700
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2018-11-16 14:11:09 +0200
commitc76fc3d804600bc4f19382576aa53269a1ec095b (patch)
treea483f48291c45d9d1d55686b918021b1ac1478c2
parent5a9e6b8776667465b4d4fb2c54842a9a344b1246 (diff)
downloadrust-c76fc3d804600bc4f19382576aa53269a1ec095b.tar.gz
rust-c76fc3d804600bc4f19382576aa53269a1ec095b.zip
Work around to fix issue https://github.com/rust-lang/rust/issues/53912
-rw-r--r--src/librustc_codegen_llvm/lib.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs
index 5d9bae5412e..d4cd2f786f8 100644
--- a/src/librustc_codegen_llvm/lib.rs
+++ b/src/librustc_codegen_llvm/lib.rs
@@ -116,7 +116,10 @@ mod debuginfo;
 mod declare;
 mod glue;
 mod intrinsic;
-pub mod llvm;
+
+// The following is a work around that replaces `pub mod llvm;` and that fixes issue 53912.
+#[path = "llvm/mod.rs"] mod llvm_; pub mod llvm { pub use super::llvm_::*; }
+
 mod llvm_util;
 mod metadata;
 mod meth;