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/vs2010backend.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/vs2010backend.py')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 22383dc..952f90c 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -1026,7 +1026,7 @@ class Vs2010Backend(backends.Backend): self.add_additional_options(lang, inc_cl, file_args) self.add_preprocessor_defines(lang, inc_cl, file_defines) self.add_include_dirs(lang, inc_cl, file_inc_dirs) - ET.SubElement(inc_cl, 'ObjectFileName').text = "$(IntDir)" + self.object_filename_from_source(target, s, False) + ET.SubElement(inc_cl, 'ObjectFileName').text = "$(IntDir)" + self.object_filename_from_source(target, s) for s in gen_src: inc_cl = ET.SubElement(inc_src, 'CLCompile', Include=s) lang = Vs2010Backend.lang_from_source_file(s) |