diff options
| author | Rob Herring <robh@kernel.org> | 2017-10-10 17:01:29 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-10-10 21:37:19 -0500 |
| commit | e5e93c727f23d0c87e1edf04705d0d0342290536 (patch) | |
| tree | ae53e81505d3ac2e4ff8617cee7d788b8543a027 | |
| parent | c3f75d483c72d4ceb22d32561f8d08bf3e0c8a0b (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 <marek.olsak@amd.com>
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | src/gallium/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/Android.mk | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index 8be365a550..6f93665365 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -40,7 +40,7 @@ SUBDIRS += winsys/i915/drm drivers/i915 SUBDIRS += winsys/nouveau/drm drivers/nouveau SUBDIRS += winsys/pl111/drm drivers/pl111 SUBDIRS += winsys/radeon/drm drivers/r300 -SUBDIRS += winsys/radeon/drm drivers/r600 drivers/radeon +SUBDIRS += winsys/radeon/drm drivers/r600 SUBDIRS += winsys/radeon/drm winsys/amdgpu/drm drivers/radeonsi drivers/radeon SUBDIRS += winsys/vc4/drm drivers/vc4 SUBDIRS += winsys/virgl/drm winsys/virgl/vtest drivers/virgl diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index 1683cfa09c..9f684cf244 100644 --- a/src/gallium/drivers/r600/Android.mk +++ b/src/gallium/drivers/r600/Android.mk @@ -45,6 +45,10 @@ $(intermediates)/egd_tables.h: $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.p @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h > $@ +ifeq ($(MESA_ENABLE_LLVM),true) +$(call mesa-build-with-llvm) +endif + include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/drivers/radeon/Android.mk b/src/gallium/drivers/radeon/Android.mk index c2d3a1cbce..578ab0be91 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 |