summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2013-01-14 17:20:53 +0000
committerTom Stellard <thomas.stellard@amd.com>2013-01-15 18:04:51 +0000
commit7824ab807050c03c6df01c44774914dcbef88248 (patch)
treea86386d58e79ae7db0d311a4dbc4280e5499427c /src
parentf26eb36e8bc17b0ff047f114538bd2485c6a52ea (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/Makefile.am6
-rw-r--r--src/gallium/targets/opencl/Makefile.am4
2 files changed, 9 insertions, 1 deletions
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
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index c5c30030cad..be8ec12ceb7 100644
--- 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 \