meson: skip some unneeded macos-specific checks

A couple of programs were always unconditionally searched for, but we
don't have to do this if we're not on darwin.

1 files changed, 24 insertions, 23 deletions

diff --git a/meson.build b/meson.build
index 56b1685fac..8808cb1d15 100644
--- a/meson.build
+++ b/meson.build
@@ -1444,15 +1444,16 @@ endif
 
 
 # macOS features
-macos_sdk_version_py = find_program(join_paths(source_root, 'TOOLS',
-                                    'macos-sdk-version.py'))
-macos_sdk_info = ['', '0.0']
-if darwin
+macos_sdk_version_py = find_program(join_paths(source_root, 'TOOLS', 'macos-sdk-version.py'),
+                                    required: get_option('swift-build').require(darwin))
+macos_sdk_path = ''
+macos_sdk_version = '0.0'
+if 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]
 endif
 
-macos_sdk_path = macos_sdk_info[0].strip()
-macos_sdk_version = macos_sdk_info[1]
 if macos_sdk_path != ''
     message('Detected macOS sdk path: ' + macos_sdk_path)
 endif
@@ -1464,22 +1465,7 @@ if macos_sdk_version != '0.0'
     add_project_link_arguments(objc_link_flags, language: ['c', 'objc'])
 endif
 
-macos_10_11_features = get_option('macos-10-11-features').require(
-    macos_sdk_version.version_compare('>=10.11'),
-    error_message: 'a suitable macos sdk version could not be found!',
-)
-
-macos_10_12_2_features = get_option('macos-10-12-2-features').require(
-    macos_sdk_version.version_compare('>=10.12.2'),
-    error_message: 'a suitable macos sdk version could not be found!',
-)
-
-macos_10_14_features = get_option('macos-10-14-features').require(
-    macos_sdk_version.version_compare('>=10.14'),
-    error_message: 'a suitable macos sdk version could not be found!',
-)
-
-xcrun = find_program('xcrun', required: get_option('swift-build'))
+xcrun = find_program('xcrun', required: get_option('swift-build').require(darwin))
 swift_ver = '0.0'
 if xcrun.found()
     swift_prog = find_program(run_command(xcrun, '-find', 'swift', check: true).stdout().strip())
@@ -1496,6 +1482,21 @@ sys.stdout.write(swift_ver)
     message('Detected Swift version: ' + swift_ver)
 endif
 
+macos_10_11_features = get_option('macos-10-11-features').require(
+    macos_sdk_version.version_compare('>=10.11'),
+    error_message: 'a suitable macos sdk version could not be found!',
+)
+
+macos_10_12_2_features = get_option('macos-10-12-2-features').require(
+    macos_sdk_version.version_compare('>=10.12.2'),
+    error_message: 'a suitable macos sdk version could not be found!',
+)
+
+macos_10_14_features = get_option('macos-10-14-features').require(
+    macos_sdk_version.version_compare('>=10.14'),
+    error_message: 'a suitable macos sdk version could not be found!',
+)
+
 swift = get_option('swift-build').require(
     darwin and macos_sdk_version.version_compare('>=10.10') and swift_ver.version_compare('>=4.1'),
     error_message: 'A suitable macos sdk version or swift version could not be found!',
@@ -1538,7 +1539,7 @@ if swift.allowed()
 endif
 
 macos_touchbar = get_option('macos-touchbar').require(
-    cc.compiles(files(join_paths(fragments, 'touchbar.m')), name: 'macos-touchbar check') and features['cocoa'],
+    features['cocoa'] and cc.compiles(files(join_paths(fragments, 'touchbar.m')), name: 'macos-touchbar check'),
     error_message: 'Either cocoa could not be found or the macos-touchbar check failed!',
 )
 features += {'macos-touchbar': macos_touchbar.allowed()}