From 7824ab807050c03c6df01c44774914dcbef88248 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 14 Jan 2013 17:20:53 +0000 Subject: Revert "targets/opencl: Link against libgallium.la instead of libgallium.a" This reverts commit 4148a29ed83d1d85bff3d4e40e847128011c3f20. This is a work-around for bug: https://bugs.freedesktop.org/show_bug.cgi?id=59334 We really should be linking against libgallium.la instead of libgallium.a, but until we can figure why linking against libgallium.la causes runtime failures in clover we will continue to link against libgallium.a Acked-by: Andreas Boll Tested-by: Aaron Watry --- src/gallium/auxiliary/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/gallium/auxiliary') diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index a4eee4773c2..49792930a22 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -45,3 +45,9 @@ util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@ + +# XXX: As a work around for https://bugs.freedesktop.org/show_bug.cgi?id=59334 +# clover needs to link against libgallium.a. Delete this once we have a real +# fix for this bug. +all-local: libgallium.la + ln -f $(builddir)/.libs/libgallium.a $(builddir)/libgallium.a -- cgit v1.2.3