From 4fc11fa3c8382635000989ea6563d2f68a64809d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 11 Jan 2013 17:27:45 +0000 Subject: [PATCH] drivers/radeon: Don't link against libgallium.la This fixes several duplicate symbol errors. libllvmradeon is a simple helper library. If it requires symbols in other libraries, this should be taken care of by the gallium target that uses it (e.g. libr600.la) --- src/gallium/drivers/radeon/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index 091adc4..e6eb241 100644 --- a/src/gallium/drivers/radeon/Makefile.am +++ b/src/gallium/drivers/radeon/Makefile.am @@ -4,7 +4,7 @@ include $(top_srcdir)/src/gallium/Automake.inc if HAVE_GALLIUM_R600 if HAVE_GALLIUM_RADEONSI lib_LTLIBRARIES = libllvmradeon@VERSION@.la -libllvmradeon@VERSION@_la_LDFLAGS = -Wl,--no-undefined -shared -avoid-version \ +libllvmradeon@VERSION@_la_LDFLAGS = -Wl, -shared -avoid-version \ $(LLVM_LDFLAGS) else noinst_LTLIBRARIES = libllvmradeon@VERSION@.la @@ -26,6 +26,5 @@ libllvmradeon@VERSION@_la_SOURCES = \ $(C_FILES) libllvmradeon@VERSION@_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(CLOCK_LIB) \ $(LLVM_LIBS) -- 2.7.4