From 725c671d61a5b1861af45c81d60d64c0740e8608 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 19 Mar 2013 20:17:57 +0100 Subject: [PATCH] radeon/llvm: Do not link against libgallium when building statically. NOTE: This is a candidate for the 9.1 branch. Tested-by: Vincent Lejeune Signed-off-by: Maarten Lankhorst (cherry picked from commit 7c3d8301afed46cf932bf23431085de490a1f83a) --- src/gallium/drivers/radeon/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index 77dd6a3deb0..a3a7b74c487 100644 --- a/src/gallium/drivers/radeon/Makefile.am +++ b/src/gallium/drivers/radeon/Makefile.am @@ -1,11 +1,14 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc +LIBGALLIUM_LIBS= + if HAVE_GALLIUM_R600 if HAVE_GALLIUM_RADEONSI lib_LTLIBRARIES = libllvmradeon@VERSION@.la libllvmradeon@VERSION@_la_LDFLAGS = -Wl, -shared -avoid-version \ $(LLVM_LDFLAGS) +LIBGALLIUM_LIBS += $(top_builddir)/src/gallium/auxiliary/libgallium.la else noinst_LTLIBRARIES = libllvmradeon@VERSION@.la endif @@ -26,6 +29,6 @@ libllvmradeon@VERSION@_la_SOURCES = \ $(C_FILES) libllvmradeon@VERSION@_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(LIBGALLIUM_LIBS) \ $(CLOCK_LIB) \ $(LLVM_LIBS)