Have --debug-mode both set debug info and disable optimizations.

--with-debug-info and --no-optimizations remain to toggle each independently.

Closes GH #433

1 files changed, 7 insertions, 3 deletions

diff --git a/configure.py b/configure.py
index 88c2b1832..529d3efe1 100755
--- a/configure.py
+++ b/configure.py
@@ -269,9 +269,6 @@ def process_command_line(args):
 
     build_group.add_option('--with-debug-info', action='store_true', default=False, dest='with_debug_info',
                            help='enable debug info')
-    # For compat and convenience:
-    build_group.add_option('--debug-mode', action='store_true', default=False, dest='with_debug_info',
-                           help=optparse.SUPPRESS_HELP)
 
     build_group.add_option('--with-sanitizers', action='store_true', default=False, dest='with_sanitizers',
                            help='enable runtime checks')
@@ -290,6 +287,9 @@ def process_command_line(args):
                            action='store_true', default=False,
                            help='disable all optimizations (for debugging)')
 
+    build_group.add_option('--debug-mode', action='store_true', default=False, dest='debug_mode',
+                           help='enable debug info and disable optimizations')
+
     build_group.add_option('--gen-amalgamation', dest='gen_amalgamation',
                            default=False, action='store_true',
                            help='generate amalgamation files')
@@ -447,6 +447,10 @@ def process_command_line(args):
         raise Exception('Bad value to --with-endian "%s"' % (
             options.with_endian))
 
+    if options.debug_mode:
+        options.no_optimizations = True
+        options.with_debug_info = True
+
     def parse_multiple_enable(modules):
         if modules is None:
             return []