aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-03-13 12:00:22 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2021-03-13 13:42:41 +0200
commit005e50c2160a792f92d854d1adb2c9784268cb7a (patch)
treeb92fe74454ed20c06e1a851d78fcb8e60c1494d7
parent1f3bf0f1357a20d9975a2de54e0fd097fc52424f (diff)
downloadmeson-005e50c2160a792f92d854d1adb2c9784268cb7a.zip
meson-005e50c2160a792f92d854d1adb2c9784268cb7a.tar.gz
meson-005e50c2160a792f92d854d1adb2c9784268cb7a.tar.bz2
Use find_program also in custom_target for consistency.
-rw-r--r--mesonbuild/interpreter.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index f169d59..652fd3e 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3983,6 +3983,9 @@ external dependencies (including libraries) must go to "dependencies".''')
mlog.warning('''Custom target input \'%s\' can\'t be converted to File object(s).
This will become a hard error in the future.''' % kwargs['input'], location=self.current_node)
kwargs['env'] = self.unpack_env_kwarg(kwargs)
+ if 'command' in kwargs and isinstance(kwargs['command'], list) and kwargs['command']:
+ if isinstance(kwargs['command'][0], str):
+ kwargs['command'][0] = self.func_find_program(node, kwargs['command'][0], {})
tg = CustomTargetHolder(build.CustomTarget(name, self.subdir, self.subproject, kwargs, backend=self.backend), self)
self.add_target(name, tg.held_object)
return tg