android: i965/tiled_memcpy: fix build for x86 generic target

[mesa.git] / src / amd / Makefile.common.am

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index 595876f610aa04e80d8fb49b1d030625aff47f2f..d62e9d41cf4f1b0c875ac30d83edec2a498b2270 100644 (file)
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -25,6 +25,7 @@ COMMON_LIBS = common/libamd_common.la
 
 # TODO cleanup these
 common_libamd_common_la_CPPFLAGS = \
+       $(AMDGPU_CFLAGS) \
        $(VALGRIND_CFLAGS) \
        $(DEFINES) \
        -I$(top_srcdir)/include \
@@ -54,17 +55,15 @@ common_libamd_common_la_CXXFLAGS = \
 noinst_LTLIBRARIES += $(COMMON_LIBS)
 
 common_libamd_common_la_SOURCES = \
+       $(AMD_COMMON_FILES) \
        $(AMD_COMPILER_FILES) \
        $(AMD_DEBUG_FILES) \
-       $(AMD_GENERATED_FILES)
-
-# nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
-# radv is built.
-if HAVE_RADEON_VULKAN
-common_libamd_common_la_SOURCES += $(AMD_NIR_FILES)
-endif
+       $(AMD_GENERATED_FILES) \
+       $(AMD_NIR_FILES)
 endif
 
+common_libamd_common_la_LIBADD = $(LIBELF_LIBS)
+
 common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h
        $(AM_V_at)$(MKDIR_P) $(@D)
        $(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@