auto merge of #14554 : kmcallister/rust/plugin_registrar, r=cmr

This implements the design in rust-lang/rfcs#86.  It shouldn't be merged until that RFC is accepted, but it would be great if somebody has time to review the code before then.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs
index fc4d5fec5f5..44d17e6fb95 100644
--- a/src/libsync/lib.rs
+++ b/src/libsync/lib.rs
@@ -25,9 +25,12 @@
 
 #![deny(missing_doc)]
 
-#[cfg(test)]
+#[cfg(test, stage0)]
 #[phase(syntax, link)] extern crate log;
 
+#[cfg(test, not(stage0))]
+#[phase(plugin, link)] extern crate log;
+
 extern crate alloc;
 
 pub use comm::{DuplexStream, duplex};