From 4256c0dae2e4793a486ef38eec4361639dbb2957 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 17 Mar 2018 20:21:46 +0200 Subject: Can override programs with scripts generated with configure_file. --- mesonbuild/interpreter.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index c958b6f..9d3a669 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1426,6 +1426,12 @@ class MesonMain(InterpreterObject): raise InterpreterException('First argument must be a string') if hasattr(exe, 'held_object'): exe = exe.held_object + if isinstance(exe, mesonlib.File): + abspath = exe.absolute_path(self.interpreter.environment.source_dir, + 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) if not isinstance(exe, dependencies.ExternalProgram): # FIXME, make this work if the exe is an Executable target. raise InterpreterException('Second argument must be an external program.') -- cgit v1.1