[Mesa-dev] [PATCH 09/12] android: gallium/auxiliary: fix building error in Android 7.0

Mauro Rossi issor.oruam at gmail.com
Tue Jan 10 00:53:05 UTC 2017


Conditional libLLVMCore static library dependency is added,
for the case when MESA_ENABLE_LLVM is true

Fixes the following building error with Android 7.0:

In file included from
external/mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp:62:
...
external/llvm/include/llvm/IR/Attributes.h:68:14: fatal error:
'llvm/IR/Attributes.inc' file not found
    #include "llvm/IR/Attributes.inc"
             ^
1 error generated.
---
 src/gallium/auxiliary/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index f5b5a0c..e8628e4 100644
--- a/src/gallium/auxiliary/Android.mk
+++ b/src/gallium/auxiliary/Android.mk
@@ -40,7 +40,7 @@ ifeq ($(MESA_ENABLE_LLVM),true)
 LOCAL_SRC_FILES += \
 	$(GALLIVM_SOURCES) \
 	$(GALLIVM_CPP_SOURCES)
-
+LOCAL_STATIC_LIBRARIES += libLLVMCore
 LOCAL_CPPFLAGS := -std=c++11
 endif
 
-- 
2.9.3



More information about the mesa-dev mailing list