Android: Fix build issue without LLVM
authorRoman Stratiienko <roman.stratiienko@globallogic.com>
Thu, 5 Dec 2019 16:32:02 +0000 (18:32 +0200)
committerTapani Pälli <tapani.palli@intel.com>
Mon, 23 Dec 2019 08:22:02 +0000 (10:22 +0200)
commitc411d4896c625e6538bf3a6681892256f352868e
tree884df931b53fa8a71c4dfd8c335b443798f67187
parent97e9de17952d1382512007e4745c25b9c9106a46
Android: Fix build issue without LLVM

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 <roman.stratiienko@globallogic.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2978>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2978>
src/gallium/auxiliary/Makefile.sources