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 <andreas.boll.dev@gmail.com>
Tested-by: Aaron Watry <awatry@gmail.com>

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index a4eee47..4979293 100644 (file)
--- 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

diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index c5c3003..be8ec12 100644 (file)
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -6,9 +6,11 @@ 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.la \
+       $(top_builddir)/src/gallium/auxiliary/libgallium.a \
        $(GALLIUM_PIPE_LOADER_LIBS) $(LIBUDEV_LIBS) \
        -ldl \
        -lclangCodeGen \