summaryrefslogtreecommitdiffstats
path: root/waftools
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2019-09-20 15:14:59 +0200
committerJan Ekström <jeebjp@gmail.com>2019-09-22 17:07:51 +0300
commitf64c0115ae475c8584e0825340b7488be4095c2c (patch)
tree508083d4908374536afc171ed3d191a0c56597cb /waftools
parentd00f9b19c77fe8e44c3b7dcacb6a11fe13326c5c (diff)
downloadmpv-f64c0115ae475c8584e0825340b7488be4095c2c.tar.bz2
mpv-f64c0115ae475c8584e0825340b7488be4095c2c.tar.xz
build: fix swift linking with upcoming xcode 11
in xcode 11 the dynamic swift libraries were moved to a separated versioned swift folder, which can't be used for linking and only for distribution. additional to the std dynamic swift lib folder the system wide folder is needed for linking too.
Diffstat (limited to 'waftools')
-rw-r--r--waftools/detections/compiler_swift.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/waftools/detections/compiler_swift.py b/waftools/detections/compiler_swift.py
index 1759052d53..854d1a6db8 100644
--- a/waftools/detections/compiler_swift.py
+++ b/waftools/detections/compiler_swift.py
@@ -44,6 +44,7 @@ def __add_dynamic_swift_library_linking_flags(ctx, swift_library):
if StrictVersion(ctx.env.SWIFT_VERSION) >= StrictVersion("5.0"):
ctx.env.append_value('LINKFLAGS', [
'-Xlinker', '-rpath', '-Xlinker', '/usr/lib/swift',
+ '-L/usr/lib/swift',
])
ctx.env.append_value('LINKFLAGS', [