---

yaml
---
r: 32736
b: refs/heads/dist-snap
c: 1b5efaa
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: e14a0eec23b49f51a32ea254f2749f2f08386f5b
+refs/heads/dist-snap: 1b5efaac27408d958a0013c040ce269ccb5c142c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/driver/driver.rs

@@ -173,7 +173,7 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
         front::test::modify_for_testing(sess, crate));
 
     crate = time(time_passes, ~"expansion", ||
-        syntax::ext::expand::expand_crate(sess.parse_sess, sess.opts.cfg,
+        syntax::ext::expand::expand_crate(sess.parse_sess, cfg,
                                           crate));
 
     if upto == cu_expand { return {crate: crate, tcx: None}; }

branches/dist-snap/src/rustc/driver/session.rs

@@ -144,6 +144,10 @@ type options =
      addl_lib_search_paths: ~[Path],
      maybe_sysroot: Option<Path>,
      target_triple: ~str,
+     // User-specified cfg meta items. The compiler itself will add additional
+     // items to the crate config, and during parsing the entire crate config
+     // will be added to the crate AST node.  This should not be used for
+     // anything except building the full crate config prior to parsing.
      cfg: ast::crate_cfg,
      binary: ~str,
      test: bool,