summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2018-02-13 18:37:38 +0100
committerAkemi <der.richter@gmx.de>2018-02-14 04:07:56 +0100
commitb38135571b07c8c1b895eab5fa0d6ec4ed8b368d (patch)
tree501f2293248fdbfb378b874b540092882f304cbe
parentfd78154377ec09688ca0613bf2aa3edfaf21e549 (diff)
downloadmpv-ci.tar.bz2
mpv-ci.tar.xz
build: fix linking libmpv when swift features are builtci
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.py2
-rw-r--r--wscript_build.py1
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 78db131beb..6006890cee 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -645,6 +645,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,