From 867963f1315023673abbe3cc823eb6d332ed8f86 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 16 Feb 2021 14:09:34 -0800 Subject: Do not validate options when finding non-matching This is a) useless because it's only used to print which options are not default, and b) harmful because it can result in cases where things break, like in projects that set a standard that the chosen compiler doesn't support, but the project (or some subset) can be built with a different standard. Fixes: #8360 --- mesonbuild/interpreter.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index f670aec..2bc1afb 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2476,13 +2476,10 @@ class Interpreter(InterpreterBase): # TODO: Why is this in interpreter.py and not CoreData or Environment? def get_non_matching_default_options(self) -> T.Iterator[T.Tuple[str, str, coredata.UserOption]]: - env = self.environment for def_opt_name, def_opt_value in self.project_default_options.items(): cur_opt_value = self.coredata.options.get(def_opt_name) - if cur_opt_value is not None: - def_opt_value = env.coredata.validate_option_value(def_opt_name, def_opt_value) - if def_opt_value != cur_opt_value.value: - yield (str(def_opt_name), def_opt_value, cur_opt_value) + if cur_opt_value is not None and def_opt_value != cur_opt_value.value: + yield (str(def_opt_name), def_opt_value, cur_opt_value) def build_func_dict(self): self.funcs.update({'add_global_arguments': self.func_add_global_arguments, -- cgit v1.1