auto merge of #15910 : sfackler/rust/nogc, r=cmr

diff --git a/src/librustc/driver/config.rs b/src/librustc/driver/config.rs
index dd951d963e0d7cfcfd35d0c8038e83e4a26dd65e..8b4fcb10907b22eafd71c8612b4a2776936c9b68 100644 (file)
--- a/src/librustc/driver/config.rs
+++ b/src/librustc/driver/config.rs
@@ -441,12 +441,6 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
     if sess.opts.test {
         append_configuration(&mut user_cfg, InternedString::new("test"))
     }
-    // If the user requested GC, then add the GC cfg
-    append_configuration(&mut user_cfg, if sess.opts.gc {
-        InternedString::new("gc")
-    } else {
-        InternedString::new("nogc")
-    });
     user_cfg.move_iter().collect::<Vec<_>>().append(default_cfg.as_slice())
 }