Mesa (master): android: gallium/auxiliary: fix building error in Android 7.0
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Jan 18 16:35:03 UTC 2017
Module: Mesa
Branch: master
Commit: 02185a1c9b4cb25a197d65d2a724eb7d26b5d691
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=02185a1c9b4cb25a197d65d2a724eb7d26b5d691
Author: Mauro Rossi <issor.oruam at gmail.com>
Date: Tue Jan 10 01:53:05 2017 +0100
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 <emil.velikov at collabora.com>
---
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
More information about the mesa-commit
mailing list