---

yaml
---
r: 3045
b: refs/heads/master
c: 182b933
h: refs/heads/master
i:
  3043: d16c815
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00eb3f5798ae77c8af135b86c827a67a8febd932
+refs/heads/master: 182b933ac4948b2cc361f31dbb80d8c5f86dfa5c

trunk/src/comp/driver/rustc.rs

@@ -434,6 +434,7 @@ fn main(vec[str] args) {
 
         //FIXME: Should we make the 'stage3's variable here?
         let str glu = "stage3/glue.o";
+        let str main = "rt/main.o";
         let str stage = "-Lstage3";
         let vec[str] gcc_args;
         let str prog = "gcc";
@@ -450,21 +451,21 @@ fn main(vec[str] args) {
                 exe_suffix = ".exe";
                 gcc_args = common_cflags + [
                             "-march=i686", "-O2",
-                            glu, "-o",
+                            glu, main, "-o",
                             saved_out_filename + exe_suffix,
                             saved_out_filename + ".o"] + common_libs;
             }
             case (session::os_macos) {
                 gcc_args = common_cflags + [
                            "-arch i386", "-O0", "-m32",
-                           glu, "-o",
+                           glu, main, "-o",
                            saved_out_filename + exe_suffix,
                            saved_out_filename + ".o"] + common_libs;
             }
             case (session::os_linux) {
                 gcc_args = common_cflags + [
                            "-march=i686", "-O2", "-m32",
-                           glu, "-o",
+                           glu, main, "-o",
                            saved_out_filename + exe_suffix,
                            saved_out_filename + ".o"] + common_libs;
             }