summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-03-19 20:17:57 +0100
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-03-19 20:20:33 +0100
commit7c3d8301afed46cf932bf23431085de490a1f83a (patch)
treeb402c28fc8131a0c688b9fa98378bf44b66d3406
parent322c840bea5838782f927a2c1d1711b0d7d50d29 (diff)
radeon/llvm: Do not link against libgallium when building statically.
NOTE: This is a candidate for the 9.1 branch. Tested-by: Vincent Lejeune <vljn@ovi.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-rw-r--r--src/gallium/drivers/radeon/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index ef75aaadcd3..140f6c68714 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
@@ -27,6 +30,6 @@ libllvmradeon@VERSION@_la_SOURCES = \
$(C_FILES)
libllvmradeon@VERSION@_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(LIBGALLIUM_LIBS) \
$(CLOCK_LIB) \
$(LLVM_LIBS)