Make all Meson level options overridable per subproject.optionrefactor3

1 files changed, 2 insertions, 4 deletions

diff --git a/mesonbuild/interpreter/compiler.py b/mesonbuild/interpreter/compiler.py
index 6f52c0e..92f63f0 100644
--- a/mesonbuild/interpreter/compiler.py
+++ b/mesonbuild/interpreter/compiler.py
@@ -11,7 +11,6 @@ import itertools
 import typing as T
 
 from .. import build
-from .. import coredata
 from .. import dependencies
 from .. import options
 from .. import mesonlib
@@ -270,10 +269,9 @@ class CompilerHolder(ObjectHolder['Compiler']):
             for idir in i.to_string_list(self.environment.get_source_dir(), self.environment.get_build_dir()):
                 args.extend(self.compiler.get_include_args(idir, False))
         if not kwargs['no_builtin_args']:
-            opts = coredata.OptionsView(self.environment.coredata.optstore, self.subproject)
-            args += self.compiler.get_option_compile_args(opts)
+            args += self.compiler.get_option_compile_args(None, self.interpreter.environment, self.subproject)
             if mode is CompileCheckMode.LINK:
-                args.extend(self.compiler.get_option_link_args(opts))
+                args.extend(self.compiler.get_option_link_args(None, self.interpreter.environment, self.subproject))
         if kwargs.get('werror', False):
             args.extend(self.compiler.get_werror_args())
         args.extend(kwargs['args'])