summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeon
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2017-10-10 17:01:29 -0500
committerRob Herring <[email protected]>2017-10-10 21:37:19 -0500
commite5e93c727f23d0c87e1edf04705d0d0342290536 (patch)
treeae53e81505d3ac2e4ff8617cee7d788b8543a027 /src/gallium/drivers/radeon
parentc3f75d483c72d4ceb22d32561f8d08bf3e0c8a0b (diff)
Android: fix build break from r600/radeon split
Commit 06bfb2d28f7a ("r600: fork and import gallium/radeon") broke the Android build: external/mesa3d/src/gallium/drivers/radeon/r600_pipe_common.c:43:10: fatal error: 'llvm-c/TargetMachine.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~~ Update the Android makefiles so that drivers/radeon is only built when radeonsi (and therefore LLVM) is enabled. Fixes: 06bfb2d28f7a (r600: fork and import gallium/radeon) Acked-by: Marek Olšák <[email protected]> Signed-off-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
-rw-r--r--src/gallium/drivers/radeon/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/Android.mk b/src/gallium/drivers/radeon/Android.mk
index c2d3a1cbce6..578ab0be91f 100644
--- a/src/gallium/drivers/radeon/Android.mk
+++ b/src/gallium/drivers/radeon/Android.mk
@@ -41,7 +41,7 @@ endif
include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
-ifneq ($(HAVE_GALLIUM_R600)$(HAVE_GALLIUM_RADEONSI),)
+ifneq ($(HAVE_GALLIUM_RADEONSI),)
$(eval GALLIUM_LIBS += $(LOCAL_MODULE))
$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
endif