diff options
| author | Akemi <der.richter@gmx.de> | 2018-03-09 14:05:38 +0100 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-03-11 22:44:26 -0700 |
| commit | 12b90e744dd220a3386a8977138fba28708c8d21 (patch) | |
| tree | c15fbe457f3649453f04b65774841c93c82f5161 /wscript_build.py | |
| parent | 047eb1b914eb07a79d1a4595d2641290638609a2 (diff) | |
| download | mpv-12b90e744dd220a3386a8977138fba28708c8d21.tar.bz2 mpv-12b90e744dd220a3386a8977138fba28708c8d21.tar.xz | |
build: fix swift build with waf 1.8.4
with older waf versions a node doesn't return an absolute path but just
a relative one. fix this by explicitly requesting an absolute one.
Fixes #5604
Diffstat (limited to 'wscript_build.py')
| -rw-r--r-- | wscript_build.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wscript_build.py b/wscript_build.py index f0b618862a..efccc97af6 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -141,7 +141,7 @@ def build(ctx): def swift(task): src = ' '.join([x.abspath() for x in task.inputs]) - bridge = ctx.path.find_node("osdep/macOS_swift_bridge.h") + bridge = ctx.path.find_node("osdep/macOS_swift_bridge.h").abspath() tgt = task.outputs[0].abspath() header = task.outputs[1].abspath() module = task.outputs[2].abspath() @@ -179,7 +179,7 @@ def build(ctx): ctx.env.append_value('LINKFLAGS', [ '-Xlinker', '-add_ast_path', - '-Xlinker', '%s' % ctx.path.find_resource("osdep/macOS_swift.swiftmodule") + '-Xlinker', '%s' % ctx.path.find_or_declare("osdep/macOS_swift.swiftmodule").abspath() ]) if ctx.dependency_satisfied('cplayer'): |