diff options
| -rw-r--r-- | mesonbuild/options.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/options.py b/mesonbuild/options.py index 124a4afdb..5fc16f5e1 100644 --- a/mesonbuild/options.py +++ b/mesonbuild/options.py @@ -1298,8 +1298,7 @@ class OptionStore: # when building natively. if not self.is_cross and key.is_for_build(): continue - if key.subproject is not None: - #self.pending_project_options[key] = valstr + if key.subproject: augstr = str(key) self.augments[augstr] = valstr elif key in self.options: @@ -1331,7 +1330,7 @@ class OptionStore: # when building natively. if not self.is_cross and key.is_for_build(): continue - if key.subproject is not None: + if key.subproject: self.pending_options[key] = valstr elif key in self.options: self.set_option(key, valstr, first_invocation) @@ -1355,7 +1354,9 @@ class OptionStore: # when building natively. if not self.is_cross and key.is_for_build(): continue - if key in self.options: + if key.subproject: + self.pending_options[key] = valstr + elif key in self.options: self.set_option(key, valstr, True) else: proj_key = key.as_root() |