---

yaml
---
r: 47709
b: refs/heads/incoming
c: c82183d
h: refs/heads/master
i:
  47707: 01a77eb
v: v3

Author: z0w0

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: e34e072d1777ad2064ed9b70ccdbe29b4f100f9b
+refs/heads/incoming: c82183de19ad3c77c16bbf34bebf1f73b297e526
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustpkg/util.rs

@@ -16,7 +16,8 @@ use syntax::ast_util::*;
 use syntax::{ast, attr, codemap, diagnostic, fold, parse, visit};
 use codemap::span;
 use semver::Version;
-use std::{json, term, sort};
+use std::{json, term, sort, getopts};
+use getopts::groups::getopts;
 use api::Listener;
 
 pub struct Package {
@@ -866,14 +867,15 @@ pub fn compile_input(sysroot: Option<Path>, input: driver::input, dir: &Path,
     let bin_dir = dir.push(~"bin");
     let test_dir = dir.push(~"test");
     let binary = os::args()[0];
-    let options: @session::options = @{
-        binary: binary,
-        crate_type: session::unknown_crate,
-        optimize: if opt { session::Aggressive } else { session::No },
-        test: test,
-        maybe_sysroot: sysroot,
-        .. *session::basic_options()
-    };
+    let matches = getopts(flags, driver::optgroups()).get();
+    let mut options = driver::build_session_options(binary, matches,
+                                                    diagnostic::emit);
+
+    options.crate_type = session::unknown_crate;
+    options.optimize = if opt { session::Aggressive } else { session::No };
+    options.test = test;
+    options.maybe_sysroot = sysroot;
+
     let sess = driver::build_session(options, diagnostic::emit);
     let cfg = driver::build_configuration(sess, binary, input);
     let mut outputs = driver::build_output_filenames(input, &None, &None,