diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2024-03-08 11:47:07 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-03-18 16:06:37 -0700 |
| commit | 8a10c8a5399077cb3cd8436914ad1d8a71d1a3e7 (patch) | |
| tree | 06a7f44377ac57e9c00fe954c08045e84ecca117 /mesonbuild/interpreter/interpreter.py | |
| parent | c793dc478bf005417dae95f62b6d6fc4fae6e5d8 (diff) | |
| download | meson-8a10c8a5399077cb3cd8436914ad1d8a71d1a3e7.tar.gz | |
coredata: remove extraneous keys when updating project_options
This can happen when a project's meson.options file is updated, and an
old option is removed.
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 47d0d2d2d..d870de191 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1035,7 +1035,7 @@ class Interpreter(InterpreterBase, HoldableObject): FeatureNew.single_use('Cargo subproject', '1.3.0', self.subproject, location=self.current_node) with mlog.nested(subp_name): ast, options = cargo.interpret(subp_name, subdir, self.environment) - self.coredata.update_project_options(options) + self.coredata.update_project_options(options, subp_name) return self._do_subproject_meson( subp_name, subdir, default_options, kwargs, ast, # FIXME: Are there other files used by cargo interpreter? @@ -1189,7 +1189,7 @@ class Interpreter(InterpreterBase, HoldableObject): if os.path.exists(option_file): oi = optinterpreter.OptionInterpreter(self.subproject) oi.process(option_file) - self.coredata.update_project_options(oi.options) + self.coredata.update_project_options(oi.options, self.subproject) self.add_build_def_file(option_file) if self.subproject: |