From d102aa8dc05e6d4766d997fa930fef2556396c6e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 25 Nov 2021 17:05:34 +0200 Subject: [PATCH 40/40] Meson: Fix syntax in cross-properties handling See osdn #43276 Signed-off-by: Marko Lindqvist --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 53fff26da3..6617fa9825 100644 --- a/meson.build +++ b/meson.build @@ -65,9 +65,11 @@ endif c_compiler = meson.get_compiler('c') if meson.is_cross_build() - cross_inc_path = meson.get_cross_property('cross_inc_path') - cross_lib_path = meson.get_cross_property('cross_lib_path') + cross_inc_str = meson.get_cross_property('cross_inc_path') + cross_inc_path = [cross_inc_str] + cross_lib_path = [meson.get_cross_property('cross_lib_path')] else + cross_inc_str = '' cross_inc_path = [] cross_lib_path = [] endif @@ -122,10 +124,10 @@ priv_headers = [ 'vfork.h' ] -if cross_inc_path == [] +if cross_inc_str == '' header_arg = [] else - header_arg = '-I' + cross_inc_path + header_arg = '-I' + cross_inc_str endif foreach hdr : pub_headers if c_compiler.has_header(hdr, args: header_arg) -- 2.33.0