rollup merge of #20482: kmcallister/macro-reform

[rust.git] / src / compiletest / compiletest.rs

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 48610b6b526d22899df5a4061453f673fd761cd5..0ce31a335d8ab7d698804a6ed7efd31172d23a67 100644 (file)
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -15,7 +15,14 @@
 
 extern crate test;
 extern crate getopts;
-#[phase(plugin, link)] extern crate log;
+
+#[cfg(stage0)]
+#[phase(plugin, link)]
+extern crate log;
+
+#[cfg(not(stage0))]
+#[macro_use]
+extern crate log;
 
 extern crate regex;