Skip to content

Commit

Permalink
meson: Only look for Objective-C compiler on macOS/iOS
Browse files Browse the repository at this point in the history
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: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/774>
  • Loading branch information
nirbheek committed Aug 4, 2020
1 parent 141062c commit 8c94e74
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions meson.build
Expand Up @@ -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'
Expand All @@ -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
Expand Down

0 comments on commit 8c94e74

Please sign in to comment.