diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-12-27 01:05:40 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-12-27 01:05:40 +0200 |
| commit | 088d3336990553d135f636a4a3cf4a2db4db86d5 (patch) | |
| tree | 21080f743b7697d7be94596cc2a8cedf936e589f /backends.py | |
| parent | a04a10d29cc88e2b19454d8cbe92409543b44c9b (diff) | |
| download | meson-088d3336990553d135f636a4a3cf4a2db4db86d5.zip meson-088d3336990553d135f636a4a3cf4a2db4db86d5.tar.gz meson-088d3336990553d135f636a4a3cf4a2db4db86d5.tar.bz2 | |
Final touches to unity builds.
Diffstat (limited to 'backends.py')
| -rw-r--r-- | backends.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends.py b/backends.py index 03bdb86..657b339 100644 --- a/backends.py +++ b/backends.py @@ -161,7 +161,7 @@ class Backend(): language = comp.get_language() suffix = '.' + comp.get_default_suffix() if language not in langlist: - outfilename = os.path.join(self.get_target_private_dir(target), target.name + suffix) + outfilename = os.path.join(self.get_target_private_dir(target), target.name + '-unity' + suffix) outfileabs = os.path.join(self.environment.get_build_dir(), outfilename) outfileabs_tmp = outfileabs + '.tmp' abs_files.append(outfileabs) @@ -231,7 +231,7 @@ class Backend(): raise MesonException('Unknown data type in object list.') 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)) + obj_list.append(self.generate_single_compile(target, outfile, src, True, unity_deps + header_deps)) linker = self.determine_linker(target, src_list) elem = self.generate_link(target, outfile, outname, obj_list, linker) self.generate_shlib_aliases(target, self.get_target_dir(target), outfile, elem) |