aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/coredata.py6
-rw-r--r--mesonbuild/mesonmain.py4
2 files changed, 8 insertions, 2 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index ff24922..1ca6fbf 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -367,6 +367,12 @@ def get_builtin_option_action(optname):
return 'store_true'
return None
+def get_builtin_option_destination(optname):
+ optname = optname.replace('-', '_')
+ if optname == 'warnlevel':
+ return 'warning_level'
+ return optname
+
def get_builtin_option_default(optname, prefix='', noneIfSuppress=False):
if is_builtin_option(optname):
o = builtin_options[optname]
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 4b55057..4b590a1 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -26,7 +26,7 @@ from .wrap import WrapMode, wraptool
default_warning = '1'
def add_builtin_argument(p, name, **kwargs):
- k = kwargs.get('dest', name.replace('-', '_'))
+ k = coredata.get_builtin_option_destination(name)
c = coredata.get_builtin_option_choices(k)
b = coredata.get_builtin_option_action(k)
h = coredata.get_builtin_option_description(k)
@@ -65,7 +65,7 @@ def create_parser():
add_builtin_argument(p, 'werror')
add_builtin_argument(p, 'layout')
add_builtin_argument(p, 'default-library')
- add_builtin_argument(p, 'warnlevel', dest='warning_level')
+ add_builtin_argument(p, 'warnlevel')
add_builtin_argument(p, 'stdsplit')
add_builtin_argument(p, 'errorlogs')
p.add_argument('--cross-file', default=None,