coredata: check for per-subproject compiler options

If the parent project has not enabled a language, the child project's
project-specific compiler option values are sitting in pending_options
after initialize_from_subproject_call, and the option store has to be
informed that they now exist.

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

Author: bonzini

mesonbuild/coredata.py

@@ -565,9 +565,12 @@ def set_options(self, opts_to_set: T.Dict[OptionKey, T.Any], subproject: str = '
 
         return dirty
 
-    def add_compiler_options(self, c_options: MutableKeyedOptionDictType, lang: str, for_machine: MachineChoice) -> None:
+    def add_compiler_options(self, c_options: MutableKeyedOptionDictType, lang: str, for_machine: MachineChoice,
+                             subproject: str) -> None:
         for k, o in c_options.items():
             assert k.subproject is None and k.machine is for_machine
+            if subproject:
+                k = k.evolve(subproject=subproject)
             if lang == 'objc' and k.name == 'c_std':
                 # For objective C, always fall back to c_std.
                 self.optstore.add_compiler_option('c', k, o)
@@ -577,7 +580,7 @@ def add_compiler_options(self, c_options: MutableKeyedOptionDictType, lang: str,
                 self.optstore.add_compiler_option(lang, k, o)
 
     def process_compiler_options(self, lang: str, comp: Compiler, subproject: str) -> None:
-        self.add_compiler_options(comp.get_options(), lang, comp.for_machine)
+        self.add_compiler_options(comp.get_options(), lang, comp.for_machine, subproject)
 
         for key in comp.base_options:
             if subproject:

test cases/common/43 subproject options/subprojects/subproject/meson.build

@@ -1,4 +1,7 @@
-project('subproject')
+project('subproject', 'c',
+  default_options: {'c_std': 'c11'})
+
+assert(get_option('c_std') == 'c11')
 
 if get_option('opt')
   error('option set when it should be unset.')