From c411d4896c625e6538bf3a6681892256f352868e Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Thu, 5 Dec 2019 18:32:02 +0200 Subject: [PATCH] Android: Fix build issue without LLVM MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Some of the latest changes are causing the following build error on Android: ``` external/mesa3d/src/gallium/auxiliary/nir/nir_to_tgsi_info.c:403:6: error: redefinition of 'nir_tgsi_scan_shader' void nir_tgsi_scan_shader(const struct nir_shader *nir, ^ external/mesa3d/src/gallium/auxiliary/nir/nir_to_tgsi_info.h:37:20: note: previous definition is here static inline void nir_tgsi_scan_shader(const struct nir_shader *nir, ^ ``` Include nir_to_tgsi_info.c and nir_to_tgsi_info.h into the build only if LLVM is enabled. Signed-off-by: Roman Stratiienko Reviewed-by: Tapani Pälli Tested-by: Marge Bot Part-of: --- src/gallium/auxiliary/Makefile.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 9951fe94a48..d31f71aaf99 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -318,8 +318,6 @@ C_SOURCES := \ NIR_SOURCES := \ nir/tgsi_to_nir.c \ nir/tgsi_to_nir.h \ - nir/nir_to_tgsi_info.c \ - nir/nir_to_tgsi_info.h \ nir/nir_draw_helpers.c \ nir/nir_draw_helpers.h @@ -451,6 +449,8 @@ GALLIVM_SOURCES := \ gallivm/lp_bld_tgsi_soa.c \ gallivm/lp_bld_type.c \ gallivm/lp_bld_type.h \ + nir/nir_to_tgsi_info.c \ + nir/nir_to_tgsi_info.h \ draw/draw_llvm.c \ draw/draw_llvm.h \ draw/draw_llvm_sample.c \ -- 2.30.2