diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-13 14:13:21 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-15 18:28:36 +0300 |
| commit | b48daeda1a53f0a1a218492e356186846a3abfff (patch) | |
| tree | 66dd497fbd88c5c2991d19601058f4f8639c64b1 /mesonbuild/build.py | |
| parent | 4e1249c920a6f64e2ca953334e9ec700f30693da (diff) | |
| download | meson-b48daeda1a53f0a1a218492e356186846a3abfff.zip meson-b48daeda1a53f0a1a218492e356186846a3abfff.tar.gz meson-b48daeda1a53f0a1a218492e356186846a3abfff.tar.bz2 | |
Make it possible to only do unity builds on subprojects.
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 6815b0c..bcbe318 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -307,7 +307,8 @@ class BuildTarget(Target): super().__init__(name, subdir, True) self.subproject = subproject # Can not be calculated from subdir as subproject dirname can be changed per project. self.is_cross = is_cross - self.is_unity = environment.coredata.get_builtin_option('unity') + unity_opt = environment.coredata.get_builtin_option('unity') + self.is_unity = unity_opt == 'on' or (unity_opt == 'subprojects' and subproject != '') self.environment = environment self.sources = [] self.compilers = OrderedDict() |