From: Tom Stellard <thomas.stell...@amd.com>
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.
---
src/gallium/auxiliary/Makefile.am | 6 ------
src/gallium/targets/opencl/Makefile.am | 4 +---
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/gallium/auxiliary/Makefile.am
b/src/gallium/auxiliary/Makefile.am
index 4979293..a4eee47 100644
--- 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 be8ec12..c5c3003 100644
--- 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 \
--
1.7.11.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
