aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-09-09 02:02:23 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-09-09 02:02:23 +0300
commit19ecad5b24a75c89a4fddf355849b1568766829e (patch)
treec81d5e36a34a3f0cb9f193b76efcfd796d048622
parent6f2b29e0f7443b2eba10fba47851e6e00c06bd86 (diff)
downloadmeson-19ecad5b24a75c89a4fddf355849b1568766829e.zip
meson-19ecad5b24a75c89a4fddf355849b1568766829e.tar.gz
meson-19ecad5b24a75c89a4fddf355849b1568766829e.tar.bz2
Mark all dependencies for run targets.
-rw-r--r--mesonbuild/backend/ninjabackend.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 481b800..0b2b304 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -424,13 +424,13 @@ int dummy;
elif isinstance(i, (build.BuildTarget, build.CustomTarget)):
relfname = self.get_target_filename(i)
arg_strings.append(os.path.join(self.environment.get_build_dir(), relfname))
+ deps.append(relfname)
elif isinstance(i, mesonlib.File):
arg_strings.append(i.rel_to_builddir(self.build_to_src))
else:
mlog.debug(str(i))
raise MesonException('Unreachable code in generate_run_target.')
- elem = NinjaBuildElement(self.all_outputs, target.name, 'CUSTOM_COMMAND', deps)
- elem.add_dep(deps)
+ elem = NinjaBuildElement(self.all_outputs, target.name, 'CUSTOM_COMMAND', [])
cmd = runnerscript + [self.environment.get_source_dir(), self.environment.get_build_dir(), target.subdir]
texe = target.command
try:
@@ -454,6 +454,7 @@ int dummy;
else:
cmd.append(target.command)
cmd += arg_strings
+ elem.add_dep(deps)
elem.add_item('COMMAND', cmd)
elem.add_item('description', 'Running external command %s.' % target.name)
elem.add_item('pool', 'console')