diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-21 07:38:32 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-21 08:00:39 +0530 |
| commit | 57ce7d461877b2ad8da4f4712879880148759bc6 (patch) | |
| tree | f6fcf145a32ad4f7cdc1022e5c441c5b91db9ddb /mesonbuild/interpreter.py | |
| parent | 9c9c5ab2a878a32c7f1e2855596caac1122b5bf5 (diff) | |
| download | meson-57ce7d461877b2ad8da4f4712879880148759bc6.zip meson-57ce7d461877b2ad8da4f4712879880148759bc6.tar.gz meson-57ce7d461877b2ad8da4f4712879880148759bc6.tar.bz2 | |
Add support for extracting objects in unity builds
Not only does extract_all_objects() now work properly again,
extract_objects() also works if you specify a subset of sources all of
which have been compiled into a single unified object.
So, for instance, this allows you to extract all the objects
corresponding to the C sources compiled into a target consisting of
C and C++ sources.
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() |