aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-12-18 14:32:25 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2018-12-20 23:01:36 +0200
commit9b13fb367250444377200911bf50918b7abf2676 (patch)
tree51c84c6b542d434af9b5b8c056057bdae9823522 /mesonbuild/interpreter.py
parentf9a35e08acd34173355fbaea391045373d931abb (diff)
downloadmeson-9b13fb367250444377200911bf50918b7abf2676.zip
meson-9b13fb367250444377200911bf50918b7abf2676.tar.gz
meson-9b13fb367250444377200911bf50918b7abf2676.tar.bz2
Factor out more option iterating
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 558e6eb..4d4445e 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1957,10 +1957,7 @@ class Interpreter(InterpreterBase):
def get_non_matching_default_options(self):
env = self.environment
for def_opt_name, def_opt_value in self.project_default_options.items():
- for option_type in [
- env.coredata.builtins, env.coredata.compiler_options,
- env.coredata.backend_options, env.coredata.base_options,
- env.coredata.user_options]:
+ for option_type in env.coredata.get_all_options():
for cur_opt_name, cur_opt_value in option_type.items():
if (def_opt_name == cur_opt_name and
def_opt_value != cur_opt_value.value):