diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2013-01-14 17:20:53 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2013-01-15 18:04:51 +0000 |
| commit | 7824ab807050c03c6df01c44774914dcbef88248 (patch) | |
| tree | a86386d58e79ae7db0d311a4dbc4280e5499427c /src/gallium/targets/opencl | |
| parent | f26eb36e8bc17b0ff047f114538bd2485c6a52ea (diff) | |
| download | external_mesa3d-7824ab807050c03c6df01c44774914dcbef88248.zip external_mesa3d-7824ab807050c03c6df01c44774914dcbef88248.tar.gz external_mesa3d-7824ab807050c03c6df01c44774914dcbef88248.tar.bz2 | |
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/gallium/targets/opencl')
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index c5c3003..be8ec12 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 \ |