From 8c94e746f5ca4a980a18dc8733953653dde6d802 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 4 Aug 2020 05:32:08 +0530 Subject: meson: Only look for Objective-C compiler on macOS/iOS On Windows, MinGW-GCC Objective-C compilers can be in PATH and mess up the build since they may not match the CPU family of the C/C++ compilers we are using. Also require them on macOS/iOS, because they should always be present. Fixes https://gitlab.freedesktop.org/gstreamer/gst-build/-/issues/88 Part-of: --- meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 75c5bf8da..bbe26158b 100644 --- a/meson.build +++ b/meson.build @@ -16,8 +16,15 @@ else endif gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90 +host_system = host_machine.system() + have_cxx = add_languages('cpp', native: false, required: false) -have_objc = add_languages('objc', native: false, required: false) + +if host_system in ['ios', 'darwin'] + have_objc = add_languages('objc', native: false) +else + have_objc = false +endif glib_req = '>= 2.44.0' orc_req = '>= 0.4.24' @@ -35,7 +42,6 @@ plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') plugins = [] cc = meson.get_compiler('c') -host_system = host_machine.system() if cc.get_id() == 'msvc' # Ignore several spurious warnings for things gstreamer does very commonly -- cgit v1.2.1