diff options
| author | Rachel Mant <DX-MON@users.noreply.github.com> | 2019-08-17 19:12:56 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-08-17 21:12:56 +0300 |
| commit | f431cff809ec7159c26792e96055747c724e669c (patch) | |
| tree | 04d4574a7db6b9911ddb70263c455283d0e5b39f /mesonbuild/interpreter.py | |
| parent | 1cb6177f033dcdf59f354376c509f16906165a97 (diff) | |
| download | meson-f431cff809ec7159c26792e96055747c724e669c.zip meson-f431cff809ec7159c26792e96055747c724e669c.tar.gz meson-f431cff809ec7159c26792e96055747c724e669c.tar.bz2 | |
Make .extract_objects() work correctly as an input to custom_target
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index dad15cf..c102978 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3314,7 +3314,7 @@ external dependencies (including libraries) must go to "dependencies".''') except mesonlib.MesonException: mlog.warning('''Custom target input \'%s\' can\'t be converted to File object(s). This will become a hard error in the future.''' % kwargs['input'], location=self.current_node) - tg = CustomTargetHolder(build.CustomTarget(name, self.subdir, self.subproject, kwargs), self) + tg = CustomTargetHolder(build.CustomTarget(name, self.subdir, self.subproject, kwargs, backend=self.backend), self) self.add_target(name, tg.held_object) return tg @@ -4058,7 +4058,8 @@ Try setting b_lundef to false instead.'''.format(self.coredata.base_options['b_s sources = [sources] for s in sources: if isinstance(s, (mesonlib.File, GeneratedListHolder, - TargetHolder, CustomTargetIndexHolder)): + TargetHolder, CustomTargetIndexHolder, + GeneratedObjectsHolder)): pass elif isinstance(s, str): self.validate_within_subproject(self.subdir, s) |