From 88b8aaea3b172d4a0224bcadf5f12e2ae6119a0c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 4 May 2017 16:17:28 +0100 Subject: [PATCH] radeon: automake: remove unneeded elf Cflags/Libs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit No longer required as of commit d90bf4ef3e1 ("radeon: remove unused radeon_elf_util.{c,h}") v2: Add the required libelf link in src/amd/Makefile.common.am Fixes: d90bf4ef3e1 ("radeon: remove unused radeon_elf_util.{c,h}") Cc: Timothy Arceri Signed-off-by: Emil Velikov Reviewed-by: Marek Olšák (v1) --- src/amd/Makefile.common.am | 2 ++ src/gallium/drivers/radeon/Makefile.am | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am index 595876f610a..83f148b8051 100644 --- a/src/amd/Makefile.common.am +++ b/src/amd/Makefile.common.am @@ -65,6 +65,8 @@ common_libamd_common_la_SOURCES += $(AMD_NIR_FILES) endif 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 > $@ diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index 57e31f751b3..2be6af4b155 100644 --- a/src/gallium/drivers/radeon/Makefile.am +++ b/src/gallium/drivers/radeon/Makefile.am @@ -16,13 +16,11 @@ libradeon_la_SOURCES = \ if HAVE_GALLIUM_LLVM AM_CFLAGS += \ - $(LLVM_CFLAGS) \ - $(LIBELF_CFLAGS) + $(LLVM_CFLAGS) libradeon_la_LIBADD = \ $(CLOCK_LIB) \ - $(LLVM_LIBS) \ - $(LIBELF_LIBS) + $(LLVM_LIBS) libradeon_la_LDFLAGS = \ $(LLVM_LDFLAGS) -- 2.30.2