From e89842ebbcab66d17c372e993dadfadcd91c2a6d Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 15 Nov 2017 17:07:37 -0800 Subject: [PATCH] meson: Fix TODO for missing dl_iterate_phdr function This function is required for both the Intel "Anvil" vulkan driver and the i965 GL driver. Error out if either of those is enabled but this function isn't found. Signed-off-by: Dylan Baker Reviewed-by: Emil Velikov Reviewed-by: Eric Engestrom --- meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 23ed42ec0f9..f844289821a 100644 --- a/meson.build +++ b/meson.build @@ -660,8 +660,10 @@ endif if cc.has_function('dl_iterate_phdr') pre_args += '-DHAVE_DL_ITERATE_PHDR' -else - # TODO: this is required for vulkan +elif with_intel_vk + error('Intel "Anvil" Vulkan driver requires the dl_iterate_phdr function') +elif with_dri_i965 and get_option('shader-cache') + error('Intel i965 GL driver requires dl_iterate_phdr when built with shader caching.') endif # Determine whether or not the rt library is needed for time functions -- 2.30.2