diff options
| author | Rob Herring <robh@kernel.org> | 2017-05-03 14:35:24 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-05-11 13:52:21 +0100 |
| commit | 26aee6f4d5a28350e1f6becfc485ce929c4126f9 (patch) | |
| tree | 2c1cc45feae6fc8dec6e3da62de74f4891db8293 /src/amd | |
| parent | e2ff12e919b5f887083225d96f4060a122c12eab (diff) | |
Android: rework LLVM build support
Currently, building with "mmma external/mesa3d" which builds all targets
and dependencies is broken for targets that require LLVM. This is due to
the build settings depending on MESA_ENABLE_LLVM. Instead of using a
conditional in the global Android.common.mk, make all the components that
need LLVM explicitly include the necessary build settings.
GALLIVM_CPP_SOURCES doesn't exist anymore, so remove that as well.
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/Android.common.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk index 18ace02b90c..62d4df15118 100644 --- a/src/amd/Android.common.mk +++ b/src/amd/Android.common.mk @@ -61,11 +61,12 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/common LOCAL_STATIC_LIBRARIES := \ - libLLVMCore \ libmesa_nir LOCAL_WHOLE_STATIC_LIBRARIES := \ libelf +$(call mesa-build-with-llvm) + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |