mirror of https://github.com/mpv-player/mpv
build: fix linking libmpv when swift features are build
this was caused by commit 2e7a4f7
. the LAST_LINKFLAGS were not added to
the linking of libmpv and that caused a linking error. manually add the
link flags the same way it's done when linking mpv.
Fixes #5968
This commit is contained in:
parent
4bf9a78b36
commit
93ec08cc7f
|
@ -28,18 +28,25 @@ def m_hook(self, node):
|
||||||
"""
|
"""
|
||||||
return self.create_compiled_task('c', node)
|
return self.create_compiled_task('c', node)
|
||||||
|
|
||||||
|
def try_last_linkflags(cls):
|
||||||
|
try:
|
||||||
|
return cls.orig_run_str + ' ${LAST_LINKFLAGS}'
|
||||||
|
except AttributeError:
|
||||||
|
try:
|
||||||
|
return cls.hcode + ' ${LAST_LINKFLAGS}'
|
||||||
|
except TypeError:
|
||||||
|
return cls.hcode.decode('iso8859-1') + ' ${LAST_LINKFLAGS}'
|
||||||
|
|
||||||
def build(ctx):
|
def build(ctx):
|
||||||
from waflib import Task
|
from waflib import Task
|
||||||
|
|
||||||
cls = Task.classes['cprogram']
|
cls = Task.classes['cprogram']
|
||||||
class cprogram(cls):
|
class cprogram(cls):
|
||||||
try:
|
run_str = try_last_linkflags(cls)
|
||||||
run_str = cls.orig_run_str + ' ${LAST_LINKFLAGS}'
|
|
||||||
except AttributeError:
|
cls = Task.classes['cshlib']
|
||||||
try:
|
class cshlib(cls):
|
||||||
run_str = cls.hcode + ' ${LAST_LINKFLAGS}'
|
run_str = try_last_linkflags(cls)
|
||||||
except TypeError:
|
|
||||||
run_str = cls.hcode.decode('iso8859-1') + ' ${LAST_LINKFLAGS}'
|
|
||||||
|
|
||||||
cls = Task.classes['macplist']
|
cls = Task.classes['macplist']
|
||||||
class macplist(cls):
|
class macplist(cls):
|
||||||
|
|
Loading…
Reference in New Issue