diff options
| author | John Ericson <git@JohnEricson.me> | 2020-08-03 12:00:09 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-08-04 00:24:05 +0300 |
| commit | 2447a1132adcbde750fb9962ca60e44ff103a651 (patch) | |
| tree | 2d6d8823b54776365e5f93c0c3e9c61c60690e27 /mesonbuild/environment.py | |
| parent | 70edf82c6c77902cd64f44848302bbac92d611d8 (diff) | |
| download | meson-2447a1132adcbde750fb9962ca60e44ff103a651.zip meson-2447a1132adcbde750fb9962ca60e44ff103a651.tar.gz meson-2447a1132adcbde750fb9962ca60e44ff103a651.tar.bz2 | |
Capitalize some constants in coredata
I've been getting confused between them and similarly-named other
things, so I figured it was high time to clean this up.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index bf75c80..01fc8e4 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -701,7 +701,7 @@ class Environment: # Read in command line and populate options # TODO: validate all of this - all_builtins = set(coredata.builtin_options) | set(coredata.builtin_options_per_machine) | set(coredata.builtin_dir_noprefix_options) + all_builtins = set(coredata.BUILTIN_OPTIONS) | set(coredata.BUILTIN_OPTIONS_PER_MACHINE) | set(coredata.builtin_dir_noprefix_options) for k, v in options.cmd_line_options.items(): try: subproject, k = k.split(':') @@ -716,7 +716,7 @@ class Environment: self.meson_options.host[subproject][k] = v elif k.startswith('build.'): k = k.lstrip('build.') - if k in coredata.builtin_options_per_machine: + if k in coredata.BUILTIN_OPTIONS_PER_MACHINE: if self.meson_options.build is None: self.meson_options.build = collections.defaultdict(dict) self.meson_options.build[subproject][k] = v |