summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Filippov <alekseyf@google.com>2018-03-07 12:48:35 +0000
committerAleksey Filippov <alekseyf@google.com>2018-03-07 12:48:35 +0000
commitbf0e01d779445a260d9e4145714ba6bbf3f6197c (patch)
treea5a06f53946c34c64ea0dc570030bb1c8e2f3243
parentbcd076276ec1648c0aa30ce0c81fe1822d2687d0 (diff)
downloadmeson-bf0e01d779445a260d9e4145714ba6bbf3f6197c.tar.gz
Get generated headers from link_whole_targets as meson does for link_targets
-rw-r--r--mesonbuild/backend/ninjabackend.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 660b1a595..376d32ccd 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