coredata: Centralize builtin option descriptions and definitions.

1 files changed, 2 insertions, 3 deletions

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 8eefd5f..cf53c53 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1341,7 +1341,7 @@ class Interpreter():
             return self.environment.coredata.compiler_options[optname].value
         except KeyError:
             pass
-        if optname not in coredata.builtin_options and self.is_subproject():
+        if not coredata.is_builtin_option(optname) and self.is_subproject():
             optname = self.subproject + ':' + optname
         try:
             return self.environment.coredata.user_options[optname].value
@@ -1364,8 +1364,7 @@ class Interpreter():
             if '=' not in option:
                 raise InterpreterException('All default options must be of type key=value.')
             key, value = option.split('=', 1)
-            builtin_options = self.coredata.builtin_options
-            if key in builtin_options:
+            if coredata.is_builtin_option(key):
                 if not self.environment.had_argument_for(key):
                     self.coredata.set_builtin_option(key, value)
                 # If this was set on the command line, do not override.