diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index c25cf5119cda..5108922c1b8d 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -162,10 +162,12 @@ def get_compiler_options_for_target(self, target): for_machine = MachineChoice.BUILD else: for_machine = MachineChoice.HOST + def fake_option(k, v): opt = self.environment.coredata.compiler_options[k] opt.value = v return opt + return OptionOverrideProxy( target.option_overrides, # no code depends on builtins for now diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index e2f73b1f76a7..8afce0f357ff 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -25,7 +25,9 @@ from .. import mlog from .. import compilers from ..compilers import CompilerArgs -from ..mesonlib import MesonException, File, python_command, replace_if_different +from ..mesonlib import ( + MesonException, MachineChoice, File, python_command, replace_if_different +) from ..environment import Environment, build_filename def autodetect_vs_version(build): diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py index bf881fed08da..bfe596c5efd9 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -14,7 +14,9 @@ import os.path, subprocess -from ..mesonlib import EnvironmentException, version_compare, is_windows, is_osx +from ..mesonlib import ( + EnvironmentException, MachineChoice, version_compare, is_windows, is_osx +) from .compilers import ( CompilerType,