---

yaml
---
r: 32311
b: refs/heads/dist-snap
c: 638db28
h: refs/heads/master
i:
  32309: 207273a
  32307: 2a00086
  32303: 4ce2063
v: v3

Author: z0w0

[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: efb576a60dbd12cdd9c732cb5d8b202283b9864a
+refs/heads/dist-snap: 638db28c472c1edadc3c37f900df28f14cca7665
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/compiletest/runtest.rs

@@ -51,7 +51,9 @@ fn run_rfail_test(config: config, props: test_props, testfile: &Path) {
     let procres = if !config.jit {
         let procres = compile_test(config, props, testfile);
 
-        if procres.status != 0 { fatal_procres(~"compilation failed!", procres); }
+        if procres.status != 0 {
+            fatal_procres(~"compilation failed!", procres);
+        }
 
         exec_compiled_test(config, props, testfile)
     } else {
@@ -83,11 +85,15 @@ fn run_rpass_test(config: config, props: test_props, testfile: &Path) {
     if !config.jit {
         let mut procres = compile_test(config, props, testfile);
 
-        if procres.status != 0 { fatal_procres(~"compilation failed!", procres); }
+        if procres.status != 0 {
+            fatal_procres(~"compilation failed!", procres);
+        }
 
         procres = exec_compiled_test(config, props, testfile);
 
-        if procres.status != 0 { fatal_procres(~"test run failed!", procres); }
+        if procres.status != 0 {
+            fatal_procres(~"test run failed!", procres);
+        }
     } else {
         let mut procres = jit_test(config, props, testfile);
 

branches/dist-snap/src/rustc/back/link.rs

@@ -85,22 +85,19 @@ mod jit {
             m: ModuleRef,
             opt: c_int,
             stacks: bool) unsafe {
-        let ptr = llvm::LLVMRustJIT(rusti::morestack_addr(), pm, m, opt, stacks);
+        let ptr = llvm::LLVMRustJIT(rusti::morestack_addr(),
+                                    pm, m, opt, stacks);
 
         if ptr::is_null(ptr) {
             llvm_err(sess, ~"Could not JIT");
         } else {
-            let bin = match os::self_exe_path() {
-                Some(path) => path.to_str(),
-                _ => ~"rustc"
-            };
             let closure = Closure {
                 code: ptr,
                 env: ptr::null()
             };
             let func: fn(~[~str]) = unsafe::transmute(closure);
 
-            func(~[bin]);
+            func(~[sess.opts.binary]);
         }
     }
 }

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

@@ -428,7 +428,8 @@ fn host_triple() -> ~str {
         };
 }
 
-fn build_session_options(matches: getopts::Matches,
+fn build_session_options(binary: ~str,
+                         matches: getopts::Matches,
                          demitter: diagnostic::emitter) -> @session::options {
     let crate_type = if opt_present(matches, ~"lib") {
         session::lib_crate
@@ -553,6 +554,7 @@ fn build_session_options(matches: getopts::Matches,
           maybe_sysroot: sysroot_opt,
           target_triple: target,
           cfg: cfg,
+          binary: binary,
           test: test,
           parse_only: parse_only,
           no_trans: no_trans,
@@ -736,7 +738,8 @@ mod test {
               Err(f) => fail ~"test_switch_implies_cfg_test: " +
                              getopts::fail_str(f)
             };
-        let sessopts = build_session_options(matches, diagnostic::emit);
+        let sessopts = build_session_options(
+            ~"rustc", matches, diagnostic::emit);
         let sess = build_session(sessopts, diagnostic::emit);
         let cfg = build_configuration(sess, ~"whatever", str_input(~""));
         assert (attr::contains_name(cfg, ~"test"));
@@ -754,7 +757,8 @@ mod test {
                     getopts::fail_str(f);
               }
             };
-        let sessopts = build_session_options(matches, diagnostic::emit);
+        let sessopts = build_session_options(
+            ~"rustc", matches, diagnostic::emit);
         let sess = build_session(sessopts, diagnostic::emit);
         let cfg = build_configuration(sess, ~"whatever", str_input(~""));
         let test_items = attr::find_meta_items_by_name(cfg, ~"test");

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

@@ -166,7 +166,7 @@ fn run_compiler(args: ~[~str], demitter: diagnostic::emitter) {
       _ => early_error(demitter, ~"multiple input filenames provided")
     };
 
-    let sopts = build_session_options(matches, demitter);
+    let sopts = build_session_options(binary, matches, demitter);
     let sess = build_session(sopts, demitter);
     let odir = getopts::opt_maybe_str(matches, ~"out-dir");
     let odir = option::map(odir, |o| Path(o));

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

@@ -114,6 +114,7 @@ type options =
      maybe_sysroot: Option<Path>,
      target_triple: ~str,
      cfg: ast::crate_cfg,
+     binary: ~str,
      test: bool,
      parse_only: bool,
      no_trans: bool,
@@ -256,6 +257,7 @@ fn basic_options() -> @options {
         maybe_sysroot: None,
         target_triple: driver::host_triple(),
         cfg: ~[],
+        binary: ~"rustc",
         test: false,
         parse_only: false,
         no_trans: false,