diff options
| author | Tom Stellard <[email protected]> | 2013-01-18 16:35:28 +0000 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2013-01-24 15:45:32 +0000 |
| commit | 0261b4ecdb80973b3a00cbe6a9a77c6085ef3dff (patch) | |
| tree | a54ae12db52255444037e969789e858d0b5bf6c0 /src/gallium | |
| parent | cf69a591e1ad16b590c9ae2eba0da6fa6c4fc741 (diff) | |
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.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 49792930a22..a4eee4773c2 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 be8ec12ceb7..c5c30030cad 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 \ |