diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 679da4abf5f..dba0bcf19be 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -1095,6 +1095,10 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
         }
     }
 
+    if cg.codegen_units < 1 {
+        early_error(error_format, "Value for codegen units must be a positive nonzero integer");
+    }
+
     let cg = cg;
 
     let sysroot_opt = matches.opt_str("sysroot").map(|m| PathBuf::from(&m));