From 6b74b55283cd4f78138b0b7e8143263d091823d8 Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Mon, 14 Aug 2023 21:14:52 -0500 Subject: [PATCH] meson: don't require swift when checking macos sdk 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. --- meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 29a93e5757..fb9ebbfae6 100644 --- a/meson.build +++ b/meson.build @@ -1482,11 +1482,15 @@ endif # macOS features -macos_sdk_version_py = find_program(join_paths(source_root, 'TOOLS', 'macos-sdk-version.py'), - required: get_option('swift-build').require(darwin)) +macos_sdk_version_py = '' +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_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_path = macos_sdk_info[0].strip() 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') endif -if swift.allowed() +if swift.allowed() and swift_sources.length() > 0 subdir('osdep') endif