diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-05-23 16:21:39 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-06-14 10:11:22 -0700 |
| commit | dae986073d5ab3a6241cecaf3362065256400772 (patch) | |
| tree | 3b842cc17520a2c723e16238a3ddeedf2d9250e3 /mesonbuild/backend/vs2010backend.py | |
| parent | f3ba24f2892fa4ccf1c6c198190f43d4da44a761 (diff) | |
| download | meson-dae986073d5ab3a6241cecaf3362065256400772.zip meson-dae986073d5ab3a6241cecaf3362065256400772.tar.gz meson-dae986073d5ab3a6241cecaf3362065256400772.tar.bz2 | |
take override_option('unity=...') into account when allowing extract_objects()
A single target could be picked for unity build, and in that case
extract_objects() should not be allowed.
Likewise for the opposite case, where extract_objects() should be allowed
if unity build is disabled for a single target. A test that covers that
case is added later.
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 32800b5..f8472da 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -878,7 +878,7 @@ class Vs2010Backend(backends.Backend): # Prefix to use to access the source tree's subdir from the vcxproj dir proj_to_src_dir = os.path.join(proj_to_src_root, self.get_target_dir(target)) (sources, headers, objects, languages) = self.split_sources(target.sources) - if self.is_unity(target): + if target.is_unity: sources = self.generate_unity_files(target, sources) compiler = self._get_cl_compiler(target) build_args = compiler.get_buildtype_args(self.buildtype) |