From 12b90e744dd220a3386a8977138fba28708c8d21 Mon Sep 17 00:00:00 2001 From: Akemi Date: Fri, 9 Mar 2018 14:05:38 +0100 Subject: 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 --- wscript_build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript_build.py') 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'): -- cgit v1.2.3