build: fix linking libmpv when swift features are built

the swift object file wasn't linked when libmpv was linked, which
resulted in a missing symbol error. add the swift object to the linking
list for libmpv too.

Fixes #5522
This commit is contained in:
Akemi 2018-02-13 18:37:38 +01:00 committed by Kevin Mitchell
parent eb224a4a55
commit 6751b5b1c2
2 changed files with 3 additions and 0 deletions

View File

@ -72,6 +72,8 @@ def __wayland_protocol_header__(ctx, **kwargs):
)
@TaskGen.feature('cprogram')
@TaskGen.feature('cshlib')
@TaskGen.feature('cstlib')
@TaskGen.feature('apply_link')
def handle_add_object(tgen):
if getattr(tgen, 'add_object', None):

View File

@ -644,6 +644,7 @@ def build(ctx):
"target": "mpv",
"source": ctx.filtered_sources(sources),
"use": ctx.dependencies_use(),
"add_object": "osdep/macOS_swift.o",
"includes": [ctx.bldnode.abspath(), ctx.srcnode.abspath()] + \
ctx.dependencies_includes(),
"features": features,