WIP

mesonbuild/build.py

@@ -330,10 +330,6 @@ def merge(self, other: Build) -> None:
                 continue
             self.__dict__[k] = v
 
-        if is_native_cross:
-            # XXX: Should we merge dependency_overrides?
-            self.environment.coredata.merge_from_native_cross(other.environment.coredata)
-
     def ensure_static_linker(self, compiler: Compiler) -> None:
         if self.static_linker[compiler.for_machine] is None and compiler.needs_static_linker():
             self.static_linker[compiler.for_machine] = detect_static_linker(self.environment, compiler)

mesonbuild/coredata.py

@@ -608,10 +608,6 @@ def copy_to_native(self) -> CoreData:
 
         return other
 
-    def merge_from_native_cross(self, other: CoreData) -> None:
-        compiler_opts = {k.as_build(): v for k, v in other.options.items() if k.type is OptionType.COMPILER}
-        self.options.update(compiler_opts)
-
     @staticmethod
     def __load_config_files(options: argparse.Namespace, scratch_dir: str, ftype: str) -> T.List[str]:
         # Need to try and make the passed filenames absolute because when the

mesonbuild/interpreter/interpreter.py

@@ -1105,11 +1105,9 @@ def _do_subproject_cargo(self, subp_name: str, subp_id: str, subdir: str,
     def get_option_internal(self, optname: str) -> coredata.UserOption:
         key = OptionKey.from_string(optname).evolve(subproject=self.subproject)
 
-        print('get_option_internal() A key:', key)
         is_native_cross = self.coredata.is_native_cross()
         if is_native_cross:
             key = key.as_native_cross()
-            print('get_option_internal() B key:', key)
 
             key_for_host = key.as_host()
             is_machine_neutral_builtin = key.is_builtin() and key_for_host not in coredata.BUILTIN_OPTIONS_PER_MACHINE
@@ -1126,7 +1124,6 @@ def get_option_internal(self, optname: str) -> coredata.UserOption:
                     (compilers.base_options, key),
                 ]
             for opts, k in candidates:
-                print('get_option_internal() C k:', k)
                 v = opts.get(k)
                 if v is None or v.yielding:
                     v = opts.get(k.as_root())