aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@igalia.com>2019-08-15 21:56:21 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2019-08-17 12:07:20 +0300
commitedec2ee0eeccbe9774d15aee56d492438248fbb4 (patch)
treedefc336d3056559193c5703dc33e58029a6803d5 /mesonbuild/interpreter.py
parentfd7e8c540063870391e6ce75aa0fb179180fa057 (diff)
downloadmeson-edec2ee0eeccbe9774d15aee56d492438248fbb4.zip
meson-edec2ee0eeccbe9774d15aee56d492438248fbb4.tar.gz
meson-edec2ee0eeccbe9774d15aee56d492438248fbb4.tar.bz2
gnome: Handle overriden g-ir-scanner
When g-ir-scanner is overriden, we can't call it at configure time but we know what options are avalaible (as it started using meson after checked options where added) so do not try to call it to retrieve the version as it will fail. Also see https://github.com/mesonbuild/meson/issues/3442
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 7a858ab..dad15cf 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -62,6 +62,10 @@ def stringifyUserArguments(args):
raise InvalidArguments('Function accepts only strings, integers, lists and lists thereof.')
+class OverrideProgram(dependencies.ExternalProgram):
+ pass
+
+
class FeatureOptionHolder(InterpreterObject, ObjectHolder):
def __init__(self, env, name, option):
InterpreterObject.__init__(self)
@@ -1901,7 +1905,7 @@ class MesonMain(InterpreterObject):
self.interpreter.environment.build_dir)
if not os.path.exists(abspath):
raise InterpreterException('Tried to override %s with a file that does not exist.' % name)
- exe = dependencies.ExternalProgram(abspath)
+ exe = OverrideProgram(abspath)
if not isinstance(exe, (dependencies.ExternalProgram, build.Executable)):
raise InterpreterException('Second argument must be an external program or executable.')
self.interpreter.add_find_program_override(name, exe)