aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mconf.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-06-10 10:28:21 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-08-01 22:00:06 -0700
commitaf763e093a8172536d96e24901b82edd2e5b2dc9 (patch)
tree06faee7e6705c1bf2ef9f8660134bd1082d87909 /mesonbuild/mconf.py
parent54fb61627851a0fe765d31955629ff5d7be2d064 (diff)
downloadmeson-af763e093a8172536d96e24901b82edd2e5b2dc9.zip
meson-af763e093a8172536d96e24901b82edd2e5b2dc9.tar.gz
meson-af763e093a8172536d96e24901b82edd2e5b2dc9.tar.bz2
mconf/mintro: use authoritative list of options from coredata
This splits the directory options and non-directory options into two dicts, and then merges them later to maintain API.
Diffstat (limited to 'mesonbuild/mconf.py')
-rw-r--r--mesonbuild/mconf.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py
index 2e03cab..f070355 100644
--- a/mesonbuild/mconf.py
+++ b/mesonbuild/mconf.py
@@ -184,19 +184,7 @@ class Conf:
if not self.default_values_only:
print(' Build dir ', self.build_dir)
- dir_option_names = ['bindir',
- 'datadir',
- 'includedir',
- 'infodir',
- 'libdir',
- 'libexecdir',
- 'localedir',
- 'localstatedir',
- 'mandir',
- 'prefix',
- 'sbindir',
- 'sharedstatedir',
- 'sysconfdir']
+ dir_option_names = list(coredata.BUILTIN_DIR_OPTIONS)
test_option_names = ['errorlogs',
'stdsplit']
core_option_names = [k for k in self.coredata.builtins if k not in dir_option_names + test_option_names]