diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-02 22:21:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 22:21:56 +0300 |
| commit | 7059c47aad2ef28046ceb8566f0c1d2f98e03cb1 (patch) | |
| tree | 01bdf4592080181fbd7c89f2350ae8573f8bb98a /mesonbuild/backend/backends.py | |
| parent | 70997ca969dab0de7a800af7f7c7d6c7e25cf4ac (diff) | |
| parent | d74ab216db4e4eb7574813517b5a7edb44631e1c (diff) | |
| download | meson-7059c47aad2ef28046ceb8566f0c1d2f98e03cb1.zip meson-7059c47aad2ef28046ceb8566f0c1d2f98e03cb1.tar.gz meson-7059c47aad2ef28046ceb8566f0c1d2f98e03cb1.tar.bz2 | |
Merge pull request #5161 from TheQwertiest/feature/custom_target_link
Can link against custom_target[i]
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 4a4f7f4..e40bcbc 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -171,6 +171,8 @@ class Backend: mlog.warning('custom_target {!r} has more than one output! ' 'Using the first one.'.format(t.name)) filename = t.get_outputs()[0] + elif isinstance(t, build.CustomTargetIndex): + filename = t.get_outputs()[0] else: assert(isinstance(t, build.BuildTarget)) filename = t.get_filename() @@ -214,7 +216,7 @@ class Backend: return os.path.join(self.get_target_dir(target), link_lib) elif isinstance(target, build.StaticLibrary): return os.path.join(self.get_target_dir(target), target.get_filename()) - elif isinstance(target, build.CustomTarget): + elif isinstance(target, (build.CustomTarget, build.CustomTargetIndex)): if not target.is_linkable_target(): raise MesonException('Tried to link against custom target "%s", which is not linkable.' % target.name) return os.path.join(self.get_target_dir(target), target.get_filename()) |