---

yaml
---
r: 130525
b: refs/heads/try
c: 4d9a478
h: refs/heads/master
i:
  130523: b4729ec
v: v3

Author: spernsteiner

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c964cb229bd342bdeb0b4506c3a6d32b03e575f6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 67b97ab6d2b7de9b69fd97dc171fcf8feec932ff
-refs/heads/try: 1b676fb7603cd2aa4e0506cb5b67d48c9da1123f
+refs/heads/try: 4d9a4786163a9a9831bf4e283b4e408be03a169b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/back/write.rs

@@ -607,6 +607,19 @@ pub fn run_passes(sess: &Session,
     };
 
     let link_obj = |output_path: &Path| {
+        // Some builds of MinGW GCC will pass --force-exe-suffix to ld, which
+        // will automatically add a .exe extension if the extension is not
+        // already .exe or .dll.  To ensure consistent behavior on Windows, we
+        // add the .exe suffix explicitly and then rename the output file to
+        // the desired path.  This will give the correct behavior whether or
+        // not GCC adds --force-exe-suffix.
+        let windows_output_path =
+            if sess.targ_cfg.os == abi::OsWindows {
+                Some(output_path.with_extension("o.exe"))
+            } else {
+                None
+            };
+
         let pname = get_cc_prog(sess);
         let mut cmd = Command::new(pname.as_slice());
 
@@ -617,7 +630,9 @@ pub fn run_passes(sess: &Session,
             cmd.arg(crate_output.with_extension(format!("{}.o", index).as_slice()));
         }
 
-        cmd.arg("-r").arg("-o").arg(output_path);
+        cmd.arg("-r")
+           .arg("-o")
+           .arg(windows_output_path.as_ref().unwrap_or(output_path));
 
         if (sess.opts.debugging_opts & config::PRINT_LINK_ARGS) != 0 {
             println!("{}", &cmd);
@@ -635,6 +650,15 @@ pub fn run_passes(sess: &Session,
                 sess.abort_if_errors();
             },
         }
+
+        match windows_output_path {
+            Some(ref windows_path) => {
+                fs::rename(windows_path, output_path).unwrap();
+            },
+            None => {
+                // The file is already named according to `output_path`.
+            }
+        }
     };
 
     // Flag to indicate whether the user explicitly requested bitcode.