From f64c0115ae475c8584e0825340b7488be4095c2c Mon Sep 17 00:00:00 2001 From: der richter Date: Fri, 20 Sep 2019 15:14:59 +0200 Subject: 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. --- TOOLS/dylib-unhell.py | 8 ++++++++ waftools/detections/compiler_swift.py | 1 + 2 files changed, 9 insertions(+) diff --git a/TOOLS/dylib-unhell.py b/TOOLS/dylib-unhell.py index 8f0b151f03..05c75789e7 100755 --- a/TOOLS/dylib-unhell.py +++ b/TOOLS/dylib-unhell.py @@ -89,8 +89,16 @@ def process_libraries(libs_dict, binary, processed = []): def process_swift_libraries(binary): command = ['xcrun', '--find', 'swift-stdlib-tool'] swiftStdlibTool = subprocess.check_output(command, universal_newlines=True).strip() + # from xcode11 on the dynamic swift libs reside in a separate directory from + # the std one, might need versioned paths for future swift versions + swiftLibPath = os.path.join(swiftStdlibTool, '../../lib/swift-5.0/macosx') + swiftLibPath = os.path.abspath(swiftLibPath) command = [swiftStdlibTool, '--copy', '--platform', 'macosx', '--scan-executable', binary, '--destination', lib_path(binary)] + + if os.path.exists(swiftLibPath): + command.extend(['--source-libraries', swiftLibPath]) + subprocess.check_output(command, universal_newlines=True) print(">> setting additional rpath for swift libraries") 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', [ -- cgit v1.2.3