diff options
author | Akemi <der.richter@gmx.de> | 2018-02-13 18:37:38 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-02-13 20:31:09 -0800 |
commit | 6751b5b1c2c65fc2c746abe0c8d712541c27f437 (patch) | |
tree | 0186b1b140a2d1c737e429cfa00235300192951c | |
parent | eb224a4a5543bb8954dd84d57c9a6af3109097cb (diff) | |
download | mpv-6751b5b1c2c65fc2c746abe0c8d712541c27f437.tar.bz2 mpv-6751b5b1c2c65fc2c746abe0c8d712541c27f437.tar.xz |
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
-rw-r--r-- | waftools/generators/sources.py | 2 | ||||
-rw-r--r-- | wscript_build.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/waftools/generators/sources.py b/waftools/generators/sources.py index b7766cc1b6..0b83432bc1 100644 --- a/waftools/generators/sources.py +++ b/waftools/generators/sources.py @@ -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): diff --git a/wscript_build.py b/wscript_build.py index efd9dc8424..4627a9fcd5 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -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, |