Module: Mesa Branch: master Commit: 7c3d8301afed46cf932bf23431085de490a1f83a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c3d8301afed46cf932bf23431085de490a1f83a
Author: Maarten Lankhorst <[email protected]> Date: Tue Mar 19 20:17:57 2013 +0100 radeon/llvm: Do not link against libgallium when building statically. NOTE: This is a candidate for the 9.1 branch. Tested-by: Vincent Lejeune <[email protected]> Signed-off-by: Maarten Lankhorst <[email protected]> --- src/gallium/drivers/radeon/Makefile.am | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index ef75aaa..140f6c6 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@[email protected] libllvmradeon@VERSION@_la_LDFLAGS = -Wl, -shared -avoid-version \ $(LLVM_LDFLAGS) +LIBGALLIUM_LIBS += $(top_builddir)/src/gallium/auxiliary/libgallium.la else noinst_LTLIBRARIES = libllvmradeon@[email protected] 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) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
