Revert "Revert "targets/opencl: Link against libgallium.la instead of libgallium.a""

This reverts commit 7824ab807050c03c6df01c44774914dcbef88248.

Now that we force linking with LLVM shared libs when building clover,
we can link against libgallium.la with no problems.

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 49792930a2200033754cb0a7767493f6e2a49abb..a4eee4773c208472590f89b2294ca7243e169db5 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -45,9 +45,3 @@ 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

diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index be8ec12ceb742e30576e9564417393b73d9c2663..c5c30030cad1969d2844bfcbae6153ed7f8d5c50 100644 (file)
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -6,11 +6,9 @@ libOpenCL_la_LDFLAGS = \
        $(LLVM_LDFLAGS) \
        -version-number 1:0
 
-# We are linking against libgallium.a rather than libgallium.la to work around
-# https://bugs.freedesktop.org/show_bug.cgi?id=59334
 libOpenCL_la_LIBADD = \
        $(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.a \
+       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(GALLIUM_PIPE_LOADER_LIBS) $(LIBUDEV_LIBS) \
        -ldl \
        -lclangCodeGen \