diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-16 21:29:21 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-04-18 14:54:52 -0400 |
| commit | 9a82b0136a6b9cd9d2000342a0506b7c8bf4897d (patch) | |
| tree | cea978decfa60fa96cd45a5a9f6dcc3294452503 /mesonbuild/backend | |
| parent | 60aaee55d47e5938662a48d85ba659d8f79c7187 (diff) | |
| download | meson-9a82b0136a6b9cd9d2000342a0506b7c8bf4897d.zip meson-9a82b0136a6b9cd9d2000342a0506b7c8bf4897d.tar.gz meson-9a82b0136a6b9cd9d2000342a0506b7c8bf4897d.tar.bz2 | |
extract_all_objects: Add 'recursive' keyword argument
To maintain backward compatibility we cannot add recursive objects by
default. Print a warning when there are recursive objects to be pulled
and the argument is not set. After a while we'll do pull recursive
objects by default.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/backends.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 2cca5e5..5a401fe 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -253,7 +253,8 @@ class Backend: elif isinstance(obj, mesonlib.File): obj_list.append(obj.rel_to_builddir(self.build_to_src)) elif isinstance(obj, build.ExtractedObjects): - obj_list += self._flatten_object_list(obj.target, obj.objlist, proj_dir_to_build_root) + if obj.recursive: + obj_list += self._flatten_object_list(obj.target, obj.objlist, proj_dir_to_build_root) obj_list += self.determine_ext_objs(obj, proj_dir_to_build_root) else: raise MesonException('Unknown data type in object list.') |