Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: use swiftc instead of swift for building

Browse Source
This commit is contained in:
Neko Asakura
2024-12-06 00:45:22 +10:00
committed by der richter
parent 90a7892545
commit 8d20b72653
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@@ -1539,7 +1539,7 @@ endif
xcrun = find_program('xcrun', required: get_option('swift-build').require(darwin)) xcrun = find_program('xcrun', required: get_option('swift-build').require(darwin))
swift_ver = '0.0' swift_ver = '0.0'
if xcrun.found() if xcrun.found()
swift_prog = find_program(run_command(xcrun, '-find', 'swift', check: true).stdout().strip()) swift_prog = find_program(run_command(xcrun, '-find', 'swiftc', check: true).stdout().strip())
swift_ver_string = run_command(swift_prog, '-version', check: true).stdout() swift_ver_string = run_command(swift_prog, '-version', check: true).stdout()
verRe = ''' verRe = '''
#!/usr/bin/env python3 #!/usr/bin/env python3

4
osdep/mac/meson.build
View File

@@ -4,8 +4,8 @@ header = join_paths(build_root, 'osdep/mac/swift.h')
module = join_paths(build_root, 'osdep/mac/swift.swiftmodule') module = join_paths(build_root, 'osdep/mac/swift.swiftmodule')
target = join_paths(build_root, 'osdep/mac/swift.o') target = join_paths(build_root, 'osdep/mac/swift.o')
swift_flags = ['-frontend', '-c', '-sdk', macos_sdk_path, swift_flags = ['-c', '-emit-library', '-static', '-sdk', macos_sdk_path,
'-enable-objc-interop', '-emit-objc-header', '-parse-as-library'] '-emit-objc-header', '-parse-as-library']
if swift_ver.version_compare('>=6.0') if swift_ver.version_compare('>=6.0')
swift_flags += ['-swift-version', '5'] swift_flags += ['-swift-version', '5']