Merge pull request #2310 from hvenev/reconfigure-get_option

Fix get_option() for base options on reconfigure.

1 files changed, 7 insertions, 2 deletions

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 9a1bb84..fc0e4ee 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1698,11 +1698,11 @@ class Interpreter(InterpreterBase):
             raise InterpreterException('Argument required for get_option.')
         optname = args[0]
         try:
-            return compilers.base_options[optname].value
+            return self.environment.get_coredata().base_options[optname].value
         except KeyError:
             pass
         try:
-            return self.environment.get_coredata().get_builtin_option(optname)
+            return self.environment.coredata.get_builtin_option(optname)
         except RuntimeError:
             pass
         try:
@@ -1727,6 +1727,11 @@ class Interpreter(InterpreterBase):
                 return self.coredata.external_args[lang]
             except KeyError:
                 pass
+        # Some base options are not defined in some environments, return the default value.
+        try:
+            return compilers.base_options[optname].value
+        except KeyError:
+            pass
         raise InterpreterException('Tried to access unknown option "%s".' % optname)
 
     @noKwargs