drivers/radeon: Don't link against libgallium.la
authorTom Stellard <thomas.stellard@amd.com>
Fri, 11 Jan 2013 17:27:45 +0000 (17:27 +0000)
committerTom Stellard <thomas.stellard@amd.com>
Fri, 11 Jan 2013 21:40:42 +0000 (21:40 +0000)
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

index 091adc4016d947da8d8f4587fabac08859a331e6..e6eb2419d86531cbcfcdbd31a423f2a3cb3d92cd 100644 (file)
@@ -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)