Rollup merge of #49503 - oli-obk:extern_crate_compiler_builtins, r=alexcrichton

Inject the `compiler_builtins` crate whenever the `core` crate is injected
2018-04-07 15:36:57 +08:00
parent 3e0b15f824 679657b863
commit 24b3a97986
18 changed files with 57 additions and 16 deletions
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -373,6 +373,7 @@ extern crate unwind;

 // compiler-rt intrinsics
 #[doc(masked)]
+#[cfg(stage0)]
 extern crate compiler_builtins;

 // During testing, this crate is not actually the "real" std library, but rather