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/interpreter.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/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 18f91ea..d00338b 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1188,7 +1188,10 @@ class MesonMain(InterpreterObject): raise InterpreterException('Tried to access compiler for unspecified language "%s".' % cname) def is_unity_method(self, args, kwargs): - return self.build.environment.coredata.get_builtin_option('unity') + optval = self.interpreter.environment.coredata.get_builtin_option('unity') + if optval == 'on' or (optval == 'subprojects' and self.interpreter.subproject != ''): + return True + return False def is_subproject_method(self, args, kwargs): return self.interpreter.is_subproject() |