diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 63eabd5212fd0..fd63f7398d202 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -793,7 +793,7 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
     remark: Passes = (SomePasses(Vec::new()), parse_passes, [UNTRACKED],
         "print remarks for these optimization passes (space separated, or \"all\")"),
     no_stack_check: bool = (false, parse_bool, [UNTRACKED],
-        "disable checks for stack exhaustion (a memory-safety hazard!)"),
+        "the --no-stack-check flag is deprecated and does nothing"),
     debuginfo: Option<usize> = (None, parse_opt_uint, [TRACKED],
         "debug info emission level, 0 = no debug info, 1 = line tables only, \
          2 = full debug info with variable and type information"),
@@ -2444,4 +2444,4 @@ mod tests {
         opts.debugging_opts.mir_opt_level = Some(1);
         assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());
     }
-}
+}
\ No newline at end of file