diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-22 14:38:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 14:38:06 -0700 |
| commit | 1e3e22c66edfa8172af445026f12d30659e1ead0 (patch) | |
| tree | 6f011879a8a34d6fe1329897eb99453559e1fbf3 /mesonbuild/interpreter.py | |
| parent | 8b27a48d568a1da5cf699bd27bcdd9b23d8f5cf4 (diff) | |
| parent | 7e9203fac9d35db0aede73c105db1baaccaaefef (diff) | |
| download | meson-1e3e22c66edfa8172af445026f12d30659e1ead0.zip meson-1e3e22c66edfa8172af445026f12d30659e1ead0.tar.gz meson-1e3e22c66edfa8172af445026f12d30659e1ead0.tar.bz2 | |
Merge pull request #938 from centricular/fix-unity-builds
Several commits that fix unity builds
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 44b5748..cc46665 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2571,8 +2571,6 @@ requirements use the version keyword argument instead.''') else: obj = self.evaluate_statement(invokable) method_name = node.name - if method_name == 'extract_objects' and self.environment.coredata.get_builtin_option('unity'): - raise InterpreterException('Single object files can not be extracted in Unity builds.') args = node.args if isinstance(obj, mparser.StringNode): obj = obj.get_value() |