diff options
| author | Emil Velikov <[email protected]> | 2014-02-24 14:20:36 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-02-24 14:59:34 +0000 |
| commit | 1ad95343373bde5b37237c5649a2b0a7dfab4801 (patch) | |
| tree | ed0bfae5ce32b25c0fabb4b1f96edec6c8d3c8ff | |
| parent | 61973ffe5b3b676472bab29b1f556278ecce8cbf (diff) | |
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 <[email protected]> (v1)
Signed-off-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/targets/xa/Makefile.am | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index ecbb9ad2d22..d5255e94b86 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -50,6 +50,11 @@ gbm_gallium_drm_la_LIBADD = \ $(LIBDRM_LIBS) \ -lm +if HAVE_DRI +gbm_gallium_drm_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la +endif + if NEED_PIPE_LOADER_XLIB gbm_gallium_drm_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index e82889e0f46..7b32a099b29 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 \ diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 7ab57ffec56..1cdb21b38b0 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -48,6 +48,11 @@ libxatracker_la_LIBADD = \ $(LIBUDEV_LIBS) \ $(LIBDRM_LIBS) +if HAVE_DRI +libxatracker_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la +endif + if NEED_PIPE_LOADER_XLIB libxatracker_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ |