summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/opencl
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-02-24 14:20:36 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2014-02-24 14:59:34 +0000
commit1ad95343373bde5b37237c5649a2b0a7dfab4801 (patch)
treeed0bfae5ce32b25c0fabb4b1f96edec6c8d3c8ff /src/gallium/targets/opencl
parent61973ffe5b3b676472bab29b1f556278ecce8cbf (diff)
downloadexternal_mesa3d-1ad95343373bde5b37237c5649a2b0a7dfab4801.zip
external_mesa3d-1ad95343373bde5b37237c5649a2b0a7dfab4801.tar.gz
external_mesa3d-1ad95343373bde5b37237c5649a2b0a7dfab4801.tar.bz2
gallium/targets: resolve undefined reference to pipe_loader_sw_probe_dri
With the introduction of the pipe_loader_sw_probe_dri helper we require the sw/dri winsys during linking stage despite it being unused by any of the targets. This will cause a minor increase in the resulting library which will be cleaned up via linker options with upcoming patches. v2: Link with libswdri.la only when available. Reported-and-tested-by: Tom Stellard <thomas.stellard@amd.com> (v1) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gallium/targets/opencl')
-rw-r--r--src/gallium/targets/opencl/Makefile.am5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index e82889e..7b32a09 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -28,6 +28,11 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \
-lclangBasic \
$(LLVM_LIBS)
+if HAVE_DRI
+lib@OPENCL_LIBNAME@_la_LIBADD += \
+ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la
+endif
+
if NEED_PIPE_LOADER_XLIB
lib@OPENCL_LIBNAME@_la_LIBADD += \
$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \