radeon/llvm: Do not link against libgallium when building statically.
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 19 Mar 2013 19:17:57 +0000 (20:17 +0100)
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 19 Mar 2013 19:20:33 +0000 (20:20 +0100)
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>
src/gallium/drivers/radeon/Makefile.am

index ef75aaadcd38246c0666995efef8b9bb49db04b1..140f6c687142448e8302c12f9d928d7378fa6c1c 100644 (file)
@@ -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)