diff options
| author | Rob Herring <[email protected]> | 2017-10-10 17:01:29 -0500 |
|---|---|---|
| committer | Rob Herring <[email protected]> | 2017-10-10 21:37:19 -0500 |
| commit | e5e93c727f23d0c87e1edf04705d0d0342290536 (patch) | |
| tree | ae53e81505d3ac2e4ff8617cee7d788b8543a027 /src/gallium/drivers/r600 | |
| 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 <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index 1683cfa09c9..9f684cf2445 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) |