diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-09-08 21:51:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 21:51:05 +0300 |
| commit | b1e4b8e1432b3883299e199b98e00e29bf8c2762 (patch) | |
| tree | b90a03674c993b08d2564dfa79451c0592de5b7b /mesonbuild/interpreter.py | |
| parent | 5d30ea99ea8c3d050b9341f3d779770d017663ed (diff) | |
| parent | d26ab47072906d7a28a8843617487e601b56dfb2 (diff) | |
| download | meson-b1e4b8e1432b3883299e199b98e00e29bf8c2762.zip meson-b1e4b8e1432b3883299e199b98e00e29bf8c2762.tar.gz meson-b1e4b8e1432b3883299e199b98e00e29bf8c2762.tar.bz2 | |
Merge pull request #768 from mesonbuild/rtfixes
Fixes for run_targets
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 0c53326..361e0aa 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1873,12 +1873,12 @@ class Interpreter(): raise InterpreterException('Run_target needs at least one positional argument.') cleaned_args = [] - for i in all_args: + for i in mesonlib.flatten(all_args): try: i = i.held_object except AttributeError: pass - if not isinstance(i, (str, build.BuildTarget, build.CustomTarget, dependencies.ExternalProgram)): + if not isinstance(i, (str, build.BuildTarget, build.CustomTarget, dependencies.ExternalProgram, mesonlib.File)): mlog.debug('Wrong type:', str(i)) raise InterpreterException('Invalid argument to run_target.') cleaned_args.append(i) |