msetup: keep pending options

New languages and subprojects can appear in subsequent configurations.
Subproject options are kept for later now that they are not stored
in pending_options, but compiler options for example are not.  Drop
OptionStore.clear_pending so that they are preserved as well.

Signed-off-by: Paolo Bonzini <[email protected]>

Author: bonzini

mesonbuild/msetup.py

@@ -213,8 +213,6 @@ def check_unused_options(self, coredata: 'coredata.CoreData', cmd_line_options:
             errstr = ', '.join(errlist)
             raise MesonException(f'Unknown options: {errstr}')
 
-        coredata.optstore.clear_pending()
-
     def _generate(self, env: environment.Environment, capture: bool, vslite_ctx: T.Optional[dict]) -> T.Optional[dict]:
         # Get all user defined options, including options that have been defined
         # during a previous invocation or using meson configure.

mesonbuild/options.py

@@ -819,9 +819,6 @@ def __init__(self, is_cross: bool) -> None:
         # Subproject options from toplevel project()
         self.pending_subproject_options: OptionDict = {}
 
-    def clear_pending(self) -> None:
-        self.pending_options = {}
-
     def ensure_and_validate_key(self, key: T.Union[OptionKey, str]) -> OptionKey:
         if isinstance(key, str):
             return OptionKey(key)