summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2018-03-09 14:05:38 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-03-11 22:44:26 -0700
commit12b90e744dd220a3386a8977138fba28708c8d21 (patch)
treec15fbe457f3649453f04b65774841c93c82f5161
parent047eb1b914eb07a79d1a4595d2641290638609a2 (diff)
downloadmpv-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
-rw-r--r--waftools/detections/compiler_swift.py4
-rw-r--r--wscript_build.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/waftools/detections/compiler_swift.py b/waftools/detections/compiler_swift.py
index 2e24362ecf..9b0e06ed8a 100644
--- a/waftools/detections/compiler_swift.py
+++ b/waftools/detections/compiler_swift.py
@@ -38,8 +38,8 @@ def __find_swift_library(ctx):
for path in swift_library_paths:
swift_library = ctx.root.find_dir([dev_path, path])
if swift_library is not None:
- ctx.end_msg(swift_library)
- __add_swift_library_linking_flags(ctx, swift_library)
+ ctx.end_msg(swift_library.abspath())
+ __add_swift_library_linking_flags(ctx, swift_library.abspath())
return
ctx.end_msg(False)
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'):