From: Denis Merigoux <denis.merigoux@gmail.com>
Date: Thu, 6 Sep 2018 17:23:42 +0000 (-0700)
Subject: Work around to fix issue https://github.com/rust-lang/rust/issues/53912
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=c76fc3d804600bc4f19382576aa53269a1ec095b;p=rust.git

Work around to fix issue https://github.com/rust-lang/rust/issues/53912
---

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 back {
 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;