merge

diff --cc Cython/Compiler/CmdLine.py
index b2b449dc97798be8eab16c5aafde3656028988a3,327d38b78b62456c78f9c1d2b0623e441fa0cdbb..c13b6d5b978b936fd8ca9dba62f95c62feebba98
--- 1/Cython/Compiler/CmdLine.py
--- 2/Cython/Compiler/CmdLine.py
+++ b/Cython/Compiler/CmdLine.py
@@@ -131,16 -132,14 +132,18 @@@ def parse_command_line(args)
                  options.language_level = 3
              elif option == "--fast-fail":
                  Options.fast_fail = True
+             elif option in ('-Werror', '--warning-errors'):
+                 Options.warning_errors = True
              elif option == "--disable-function-redefinition":
                  Options.disable_function_redefinition = True
 -            elif option in ("-X", "--directive"):
 +            elif option == "--directive" or option.startswith('-X'):
 +                if option.startswith('-X') and option[2:].strip():
 +                    x_args = option[2:]
 +                else:
 +                    x_args = pop_arg()
                  try:
                      options.compiler_directives = Options.parse_directive_list(
 -                        pop_arg(), relaxed_bool=True,
 +                        x_args, relaxed_bool=True,
                          current_settings=options.compiler_directives)
                  except ValueError, e:
                      sys.stderr.write("Error in compiler directive: %s\n" % e.args[0])