aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-09-17 22:31:03 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-09-25 19:20:26 +0300
commite23e5c48d7eee9fb519e7a458c18f78389bb0089 (patch)
tree61c8754b9a4e5e28e18f2f83f2d0c2cdba220e1e /mesonbuild/backend/ninjabackend.py
parent5f90aac4edd89953c3a4d9941165556dba59b2a1 (diff)
downloadmeson-e23e5c48d7eee9fb519e7a458c18f78389bb0089.zip
meson-e23e5c48d7eee9fb519e7a458c18f78389bb0089.tar.gz
meson-e23e5c48d7eee9fb519e7a458c18f78389bb0089.tar.bz2
Use custom target outputs to determine linker. Closes #786.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index db9e1b0..251f7ee 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -264,10 +264,12 @@ int dummy;
unity_src = []
unity_deps = [] # Generated sources that must be built before compiling a Unity target.
header_deps += self.get_generated_headers(target)
+ generator_output_sources = [] # Needed to determine the linker
for gensource in target.get_generated_sources():
if isinstance(gensource, build.CustomTarget):
for src in gensource.output:
src = os.path.join(self.get_target_dir(gensource), src)
+ generator_output_sources.append(src)
if self.environment.is_source(src) and not self.environment.is_header(src):
if is_unity:
unity_deps.append(os.path.join(self.environment.get_build_dir(), RawFilename(src)))
@@ -285,6 +287,7 @@ int dummy;
header_deps.append(RawFilename(src))
else:
for src in gensource.get_outfilelist():
+ generator_output_sources.append(src)
if self.environment.is_object(src):
obj_list.append(os.path.join(self.get_target_private_dir(target), src))
elif not self.environment.is_header(src):
@@ -330,7 +333,7 @@ int dummy;
if is_unity:
for src in self.generate_unity_files(target, unity_src):
obj_list.append(self.generate_single_compile(target, outfile, src, True, unity_deps + header_deps))
- linker = self.determine_linker(target, src_list)
+ linker = self.determine_linker(target, src_list + generator_output_sources)
elem = self.generate_link(target, outfile, outname, obj_list, linker, pch_objects)
self.generate_shlib_aliases(target, self.get_target_dir(target))
elem.write(outfile)