summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMauro Rossi <[email protected]>2017-01-10 01:53:05 +0100
committerEmil Velikov <[email protected]>2017-01-18 16:24:19 +0000
commit02185a1c9b4cb25a197d65d2a724eb7d26b5d691 (patch)
treee92251bb93c30db053cb32d252ffe2a02a99816b /src
parentf93f7cae14b387dc69b775b09622775c850a12b3 (diff)
android: gallium/auxiliary: fix building error in Android 7.0
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. Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index f5b5a0cccce..e8628e43744 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