diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-24 15:02:32 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-24 15:02:43 +0300 |
| commit | ea4fe8e4177fa243c0886931bcb7ba6625e947f3 (patch) | |
| tree | 7c0dd2da981faa7c6b621fe2cec3d3fdb4ac2763 /mesonbuild | |
| parent | 4934e70092cff9b0e23227da9f4c4b6c389da835 (diff) | |
| download | meson-ea4fe8e4177fa243c0886931bcb7ba6625e947f3.zip meson-ea4fe8e4177fa243c0886931bcb7ba6625e947f3.tar.gz meson-ea4fe8e4177fa243c0886931bcb7ba6625e947f3.tar.bz2 | |
Run_target can run binaries obtained with find_program.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 6ec5e3d..b583e62 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -425,6 +425,8 @@ int dummy; if exe_wrap is not None: cmd += [exe_wrap] cmd.append(abs_exe) + elif isinstance(texe, dependencies.ExternalProgram): + cmd += texe.get_command() else: cmd.append(target.command) cmd += arg_strings diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index e114ab2..c997e0e 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1768,7 +1768,7 @@ class Interpreter(): i = i.held_object except AttributeError: pass - if not isinstance(i, (str, build.BuildTarget, build.CustomTarget)): + if not isinstance(i, (str, build.BuildTarget, build.CustomTarget, dependencies.ExternalProgram)): mlog.debug('Wrong type:', str(i)) raise InterpreterException('Invalid argument to run_target.') cleaned_args.append(i) |