diff options
author | Christoph Behle <behlec@gmail.com> | 2018-06-12 19:43:49 +0200 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-18 07:52:15 +0000 |
commit | 9e0397805e80adcace18eaeb9a31822dd793264b (patch) | |
tree | 67fd64c0b990e828b754c35d3430505a239a86c5 | |
parent | 93b5a42adac4f06173020ab272c3a070a2dfdf6a (diff) | |
download | meson-9e0397805e80adcace18eaeb9a31822dd793264b.zip meson-9e0397805e80adcace18eaeb9a31822dd793264b.tar.gz meson-9e0397805e80adcace18eaeb9a31822dd793264b.tar.bz2 |
Use stub to report misuse of get_define
Instead of checking on the call site add a stub to Compiler which raises
an exception.
-rw-r--r-- | mesonbuild/compilers/compilers.py | 3 | ||||
-rw-r--r-- | mesonbuild/interpreter.py | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 68d4c5a..87e3d78 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -699,6 +699,9 @@ class Compiler: def get_default_suffix(self): return self.default_suffix + def get_define(self, dname, prefix, env, extra_args, dependencies): + raise EnvironmentException('%s does not support get_define ' % self.get_id()) + def get_exelist(self): return self.exelist[:] diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 5888ef4..3de58bd 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1234,10 +1234,7 @@ class CompilerHolder(InterpreterObject): raise InterpreterException('Prefix argument of get_define() must be a string.') extra_args = self.determine_args(kwargs) deps = self.determine_dependencies(kwargs) - if hasattr(self.compiler, 'get_define'): - value = self.compiler.get_define(element, prefix, self.environment, extra_args, deps) - else: - raise InterpreterException('get_define is not supported for compiler ' + self.compiler.language) + value = self.compiler.get_define(element, prefix, self.environment, extra_args, deps) mlog.log('Fetching value of define "%s": %s' % (element, value)) return value |