diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-06-14 19:25:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 19:25:18 +0300 |
| commit | ce889d68706092159dfc4802301d01ff023f05a4 (patch) | |
| tree | 26897128a813829821d1ad714a9f19d085c9e95e /mesonbuild/modules | |
| parent | 0352c900bc33ae2796d1e0881986f2163b7e256d (diff) | |
| parent | 181c3499fde491650269c236ea639c92f10c6914 (diff) | |
| download | meson-ce889d68706092159dfc4802301d01ff023f05a4.tar.gz | |
Merge pull request #13307 from mesonbuild/optstorerefactor
Convert OptionStore from a dict to a full class with named methods
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/python.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/rust.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 4405c40cc..cab7c76a3 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -906,7 +906,7 @@ class GnomeModule(ExtensionModule): if state.project_args.get(lang): cflags += state.project_args[lang] if mesonlib.OptionKey('b_sanitize') in compiler.base_options: - sanitize = state.environment.coredata.options[mesonlib.OptionKey('b_sanitize')].value + sanitize = state.environment.coredata.optstore.get_value('b_sanitize') cflags += compiler.sanitizer_compile_args(sanitize) sanitize = sanitize.split(',') # These must be first in ldflags diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index e84bee187..013723da0 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -207,7 +207,7 @@ class PythonInstallation(_ExternalProgramHolder['PythonExternalProgram']): new_link_args = mesonlib.extract_as_list(kwargs, 'link_args') - is_debug = self.interpreter.environment.coredata.options[OptionKey('debug')].value + is_debug = self.interpreter.environment.coredata.optstore.get_value('debug') if is_debug: new_link_args.append(python_windows_debug_link_exception) else: diff --git a/mesonbuild/modules/rust.py b/mesonbuild/modules/rust.py index 8534dfa31..a8e22541c 100644 --- a/mesonbuild/modules/rust.py +++ b/mesonbuild/modules/rust.py @@ -231,7 +231,7 @@ class RustModule(ExtensionModule): # bindgen always uses clang, so it's safe to hardcode -I here clang_args.extend([f'-I{x}' for x in i.to_string_list( state.environment.get_source_dir(), state.environment.get_build_dir())]) - if are_asserts_disabled(state.environment.coredata.options): + if are_asserts_disabled(state.environment.coredata.optstore): clang_args.append('-DNDEBUG') for de in kwargs['dependencies']: |