diff options
author | Hristo Venev <hristo@venev.name> | 2017-09-11 20:13:26 +0100 |
---|---|---|
committer | Hristo Venev <hristo@venev.name> | 2017-09-15 21:56:46 +0100 |
commit | 56c566a38e37c5de12f3a5fa17184572c75fcfa0 (patch) | |
tree | 9616c831084a48194579c4ebaa0e10abfbbecbb6 /mesonbuild/interpreter.py | |
parent | f2fc32069bc6698ecc65accc455a296b59eb55c7 (diff) | |
download | meson-56c566a38e37c5de12f3a5fa17184572c75fcfa0.zip meson-56c566a38e37c5de12f3a5fa17184572c75fcfa0.tar.gz meson-56c566a38e37c5de12f3a5fa17184572c75fcfa0.tar.bz2 |
Fix get_option() for base options on reconfigure.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 2bcf198..6083c61 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1692,11 +1692,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: @@ -1721,6 +1721,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 |