diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-13 15:21:57 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-18 14:49:52 -0400 |
| commit | b0e4d4047b2f8c9b2056a6f2585fd793f8ba0914 (patch) | |
| tree | af6c280ff67e974a56e529374cdf5a127a3e70be /mesonbuild/backend/ninjabackend.py | |
| parent | 628f9107609d883d4094a183194d1fae0171f719 (diff) | |
| download | meson-b0e4d4047b2f8c9b2056a6f2585fd793f8ba0914.zip meson-b0e4d4047b2f8c9b2056a6f2585fd793f8ba0914.tar.gz meson-b0e4d4047b2f8c9b2056a6f2585fd793f8ba0914.tar.bz2 | |
Fix using object extracted from a unity build
- determine_ext_objs: What matters is if extobj.target is a unity build,
not if the target using those objects is a unity build.
- determine_ext_objs: Return one object file per compiler, taking into
account generated sources.
- object_filename_from_source: No need to special-case unity build, it
does the same thing in both code paths.
- check_unity_compatible: For each compiler we must extract either none
or all its sources, taking into account generated sources.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index bc3a8ef..cbb3e5e 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2203,7 +2203,7 @@ rule FORTRAN_DEP_HACK raise AssertionError('BUG: broken generated source file handling for {!r}'.format(src)) else: raise InvalidArguments('Invalid source type: {!r}'.format(src)) - obj_basename = self.object_filename_from_source(target, src, self.is_unity(target)) + obj_basename = self.object_filename_from_source(target, src) rel_obj = os.path.join(self.get_target_private_dir(target), obj_basename) dep_file = compiler.depfile_for_object(rel_obj) |