From b38135571b07c8c1b895eab5fa0d6ec4ed8b368d Mon Sep 17 00:00:00 2001 From: Akemi Date: Tue, 13 Feb 2018 18:37:38 +0100 Subject: 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 --- waftools/generators/sources.py | 2 ++ wscript_build.py | 1 + 2 files changed, 3 insertions(+) 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, -- cgit v1.2.3