summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2013-03-19 11:55:41 +0100
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-03-19 12:07:51 +0100
commit36320bfa54b758b34df732250365b91ff1ab858c (patch)
treecd58a170191d332c91a356bbded3a45b5aa95f2f /src/gallium
parentde315f76a266ce51ca0638b9ea2ec3ccfd31f03b (diff)
radeon/llvm: Link against libgallium.la to fix an undefined symbol
Ported from downstream: http://anonscm.debian.org/gitweb/?p=pkg-xorg/lib/mesa.git;a=blob;f=debian/patches/119-libllvmradeon-link.patch;h=ee47f8a07dbf33c32f8b57faed923680ed6648fb;hb=refs/heads/ubuntu%2B1 Fixes a regression introduced with f70c3853513637fa6ed38e75f73d472a9fa61213 NOTE: This is a candidate for the 9.1 branch. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62434 Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/radeon/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index 678a0cb31d9..ef75aaadcd3 100644
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -27,5 +27,6 @@ libllvmradeon@VERSION@_la_SOURCES = \
$(C_FILES)
libllvmradeon@VERSION@_la_LIBADD = \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(CLOCK_LIB) \
$(LLVM_LIBS)