diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 4 |
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 \ |