diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-03-03 09:21:51 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-03-03 11:26:23 -0800 |
| commit | daf4774cea27e223ca338310912734c05d0f4d54 (patch) | |
| tree | 1008a2608dbc81fc91263ae47c2e80a1717d0bf5 | |
| parent | 294eca343d072a18a22d9a0cf932a8e97bdb16ed (diff) | |
| download | meson-daf4774cea27e223ca338310912734c05d0f4d54.tar.gz | |
coredata: subproject should be None for checking in base_options
These options are stored as a "global" options, ie, subproject=None.
Therefore, the call to `as_root()` could never be correct, and only the
`k in base_options` check could ever be correct. Since these options are
not supposed to be set here in the root project or in subprojects, we
want to check for the global option and skip.
| -rw-r--r-- | mesonbuild/coredata.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 8dbf16513..b581dc051 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -696,7 +696,7 @@ class CoreData: # adding languages and setting backend. if self.optstore.is_compiler_option(k) or self.optstore.is_backend_option(k): continue - if self.optstore.is_base_option(k) and (k in base_options or k.as_root() in base_options): + if self.optstore.is_base_option(k) and k.evolve(subproject=None) in base_options: # set_options will report unknown base options continue options[k] = v |