RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-06 07:01:45 +00:00
Code Issues Releases Wiki Activity

meson: don't require swift when checking macos sdk

Browse Source 
It turns out that iOS doesn't actually need swift so this sdk check was
too strict and the build failed. Instead, only check this if we have
darwin and then make sure that the osdep subdir is only executed if
there are swift sources in the list. Fixes #12161.
This commit is contained in:
Dudemanguy 2023-08-14 21:14:52 -05:00
parent 5409274e6d
commit 6b74b55283
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -1482,11 +1482,15 @@ endif
# macOS features # macOS features
macos_sdk_version_py = find_program(join_paths(source_root, 'TOOLS', 'macos-sdk-version.py'), macos_sdk_version_py = ''
required: get_option('swift-build').require(darwin)) if darwin
macos_sdk_version_py = find_program(join_paths(source_root, 'TOOLS', 'macos-sdk-version.py'),
required: true)
endif
macos_sdk_path = '' macos_sdk_path = ''
macos_sdk_version = '0.0' macos_sdk_version = '0.0'
if macos_sdk_version_py.found() if darwin and macos_sdk_version_py.found()
macos_sdk_info = run_command(macos_sdk_version_py, check: true).stdout().split(',') macos_sdk_info = run_command(macos_sdk_version_py, check: true).stdout().split(',')
macos_sdk_path = macos_sdk_info[0].strip() macos_sdk_path = macos_sdk_info[0].strip()
macos_sdk_version = macos_sdk_info[1] macos_sdk_version = macos_sdk_info[1]
@ -1572,7 +1576,7 @@ if features['macos-media-player']
swift_sources += files('osdep/macos/remote_command_center.swift') swift_sources += files('osdep/macos/remote_command_center.swift')
endif endif
if swift.allowed() if swift.allowed() and swift_sources.length() > 0
subdir('osdep') subdir('osdep')
endif endif