Fixes the following building errors: In file included from external/mesa/src/amd/common/ac_shader_info.c:25: In file included from external/mesa/src/amd/common/ac_nir_to_llvm.h:29: In file included from external/llvm/include/llvm-c/TargetMachine.h:23: external/llvm/include/llvm-c/Target.h:23:10: fatal error: 'llvm/Config/llvm-config.h' file not found #include "llvm/Config/llvm-config.h" ^ 1 error generated.
In file included from external/mesa/src/amd/common/ac_llvm_helper.cpp:32: In file included from external/mesa/src/amd/common/ac_llvm_util.h:30: In file included from external/llvm/include/llvm-c/TargetMachine.h:23: external/llvm/include/llvm-c/Target.h:23:10: fatal error: 'llvm/Config/llvm-config.h' file not found #include "llvm/Config/llvm-config.h" ^ 1 error generated. Fixes: 4734bfc02a "Android: Fix LLVM duplicated symbols linking for N and M" Cc: Rob Herring <r...@kernel.org> Cc: Qiang Yu <qiang...@amd.com> Cc: Emil Velikov <emil.l.veli...@gmail.com> Cc: 17.2 <mesa-sta...@lists.freedesktop.org> --- Android.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index c1a664b2b4..d818399a9f 100644 --- a/Android.mk +++ b/Android.mk @@ -88,11 +88,14 @@ define mesa-build-with-llvm $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5), \ $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \ $(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0)) \ + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0) \ + $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include)) \ $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0)) \ + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0) \ + $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include)) \ $(if $(filter O,$(MESA_ANDROID_MAJOR_VERSION)), \ - $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0)) \ + $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_PATCH=0) \ + $(eval LOCAL_C_INCLUDES += external/llvm/include external/llvm/device/include)) \ $(eval LOCAL_SHARED_LIBRARIES += libLLVM) endef -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev