diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-07 21:05:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-07 21:05:24 +0200 |
| commit | 8bd33ab9814b1f9e131e47f1a9fa1f69adc6a85b (patch) | |
| tree | 1f574dc428a48d0049a3b81b6729ab05409d3fb3 /mesonbuild/backend/ninjabackend.py | |
| parent | ccd198a849b2741ccfe5c8aa96f6f4fd3ad746c2 (diff) | |
| parent | 9b6d2f8a25f94cb5cdc04986e72d0eaaeaec0591 (diff) | |
| download | meson-8bd33ab9814b1f9e131e47f1a9fa1f69adc6a85b.zip meson-8bd33ab9814b1f9e131e47f1a9fa1f69adc6a85b.tar.gz meson-8bd33ab9814b1f9e131e47f1a9fa1f69adc6a85b.tar.bz2 | |
Merge pull request #3195 from sarum9in/link_whole-generators
Get generated headers from link_whole_targets as meson does for link_targets
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 660b1a5..376d32c 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -14,6 +14,7 @@ import os, pickle, re, shlex, subprocess from collections import OrderedDict +import itertools from pathlib import PurePath from . import backends @@ -263,7 +264,7 @@ int dummy; vala_header = File.from_built_file(self.get_target_dir(target), target.vala_header) header_deps.append(vala_header) # Recurse and find generated headers - for dep in target.link_targets: + for dep in itertools.chain(target.link_targets, target.link_whole_targets): if isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): header_deps += self.get_generated_headers(dep) return header_deps |