diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-10 03:19:10 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-10 22:32:41 +0530 |
| commit | 711c0cbd674a84fc2d28d0b92dfb62124180d3ef (patch) | |
| tree | 2a28e7131aefff024a97f5113d80d11aece99985 /mesonbuild/backend/ninjabackend.py | |
| parent | cdae69c0f8c5623f9e563c15a50e453530366e3d (diff) | |
| download | meson-711c0cbd674a84fc2d28d0b92dfb62124180d3ef.zip meson-711c0cbd674a84fc2d28d0b92dfb62124180d3ef.tar.gz meson-711c0cbd674a84fc2d28d0b92dfb62124180d3ef.tar.bz2 | |
vs: Fix depend_files support in custom targets
This was totally broken and we didn't notice because we had no tests
for it at all.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index ec6d050..848aa59 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -468,6 +468,7 @@ int dummy; self.custom_target_generator_inputs(target, outfile) (srcs, ofilenames, cmd) = self.eval_custom_target_command(target) deps = self.unwrap_dep_list(target) + deps += self.get_custom_target_depend_files(target) desc = 'Generating {0} with a {1} command.' if target.build_always: deps.append('PHONY') @@ -476,11 +477,6 @@ int dummy; else: rulename = 'CUSTOM_COMMAND_DEP' elem = NinjaBuildElement(self.all_outputs, ofilenames, rulename, srcs) - for i in target.depend_files: - if isinstance(i, mesonlib.File): - deps.append(i.rel_to_builddir(self.build_to_src)) - else: - deps.append(os.path.join(self.build_to_src, i)) elem.add_dep(deps) for d in target.extra_depends: # Add a dependency on all the outputs of this target |