diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-08-04 19:32:04 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-06 14:44:31 -0700 |
| commit | 99d7664965f36fd41520d66e73374879dd26935e (patch) | |
| tree | 38f7fbb1815f865fd6d252d4b8576a3222a1606e /mesonbuild | |
| parent | 5272395b14e3ef1247091da38221a0c36fdb3290 (diff) | |
| download | meson-99d7664965f36fd41520d66e73374879dd26935e.tar.gz | |
coredata: remove dead code to copy over build options
Build-machine options do not exist at all when not cross compiling,
so the code in copy_build_options_from_regular_ones is dead.
Since it does not take into account OptionStore.augments, it is
also buggy; kill it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/coredata.py | 23 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 |
2 files changed, 0 insertions, 25 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index d5b337169..1897799f4 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -503,26 +503,6 @@ class CoreData: return False return len(self.cross_files) > 0 - def copy_build_options_from_regular_ones(self, shut_up_pylint: bool = True) -> bool: - # FIXME, needs cross compilation support. - if shut_up_pylint: - return False - dirty = False - assert not self.is_cross_build() - for k in options.BUILTIN_OPTIONS_PER_MACHINE: - o = self.optstore.get_value_object_for(k.name) - dirty |= self.optstore.set_option(k, o.value, True) - for bk, bv in self.optstore.items(): - if bk.machine is MachineChoice.BUILD: - hk = bk.as_host() - try: - hv = self.optstore.get_value_object(hk) - dirty |= bv.set_value(hv.value) - except KeyError: - continue - - return dirty - def set_options(self, opts_to_set: T.Dict[OptionKey, T.Any], subproject: str = '', first_invocation: bool = False) -> bool: dirty = False if not self.is_cross_build(): @@ -560,9 +540,6 @@ class CoreData: sub = f'In subproject {subproject}: ' if subproject else '' raise MesonException(f'{sub}Unknown options: "{unknown_options_str}"') - if not self.is_cross_build(): - dirty |= self.copy_build_options_from_regular_ones() - return dirty def add_compiler_options(self, c_options: MutableKeyedOptionDictType, lang: str, for_machine: MachineChoice, diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index a5d9e8fb4..5013d1829 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1483,8 +1483,6 @@ class Interpreter(InterpreterBase, HoldableObject): def add_languages(self, args: T.List[str], required: bool, for_machine: MachineChoice) -> bool: success = self.add_languages_for(args, required, for_machine) - if not self.coredata.is_cross_build(): - self.coredata.copy_build_options_from_regular_ones() self._redetect_machines() return success |