From e3d58492256fa02b40504ccee3852d81bd08505e Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 12 May 2020 05:00:36 +0530 Subject: [PATCH] meson: Pass native: false to add_languages() This is needed for cross-compiling without a build machine compiler available. The option was added in 0.54, but we only need this in Cerbero and it doesn't affect older versions so it should be ok. Will only cause a spurious warning. Part-of: --- ext/modplug/meson.build | 2 +- ext/openni2/meson.build | 2 +- meson.build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/modplug/meson.build b/ext/modplug/meson.build index 9e99d89c56..659c291a14 100644 --- a/ext/modplug/meson.build +++ b/ext/modplug/meson.build @@ -1,4 +1,4 @@ -if not add_languages('cpp', required: get_option('modplug')) +if not add_languages('cpp', native: false, required: get_option('modplug')) subdir_done() endif diff --git a/ext/openni2/meson.build b/ext/openni2/meson.build index f14d28c5ab..8b918768da 100644 --- a/ext/openni2/meson.build +++ b/ext/openni2/meson.build @@ -1,4 +1,4 @@ -if not add_languages('cpp', required: get_option('openni2')) +if not add_languages('cpp', native: false, required: get_option('openni2')) subdir_done() endif diff --git a/meson.build b/meson.build index fced765407..570f651ad7 100644 --- a/meson.build +++ b/meson.build @@ -34,7 +34,7 @@ plugins = [] cc = meson.get_compiler('c') cxx = meson.get_compiler('cpp') -have_objc = add_languages('objc', required : false) +have_objc = add_languages('objc', native: false, required: false) cdata = configuration_data() @@ -369,7 +369,7 @@ if ['darwin', 'ios'].contains(host_system) # cdata.set('HAVE_VIDEOTOOLBOX_10_9_6', 1) # endif endif -have_objcpp = add_languages('objcpp', required : false) +have_objcpp = add_languages('objcpp', native: false, required: false) have_orcc = false orcc_args = []