---

yaml
---
r: 154866
b: refs/heads/try2
c: 6d2d47b
h: refs/heads/master
v: v3

Author: spernsteiner

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4d9a4786163a9a9831bf4e283b4e408be03a169b
+refs/heads/try2: 6d2d47b2fc73b7beacced1f2a62037193ea1ed30
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -476,6 +476,9 @@ pub fn run_passes(sess: &Session,
         sess.fatal("can't perform LTO when using multiple codegen units");
     }
 
+    // Sanity check
+    assert!(trans.modules.len() == sess.opts.cg.codegen_units);
+
     unsafe {
         configure_llvm(sess);
     }
@@ -607,6 +610,15 @@ pub fn run_passes(sess: &Session,
     };
 
     let link_obj = |output_path: &Path| {
+        // Running `ld -r` on a single input is kind of pointless.
+        if sess.opts.cg.codegen_units == 1 {
+            fs::copy(&crate_output.with_extension("0.o"),
+                     output_path).unwrap();
+            // Leave the .0.o file around, to mimic the behavior of the normal
+            // code path.
+            return;
+        }
+
         // 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