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>

diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am
index ecbb9ad2d22e6c8e9b6a17ff181a30b1aa0b9976..d5255e94b8635227daa3ba1814256de422882bb3 100644 (file)
--- 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 e82889e0f46045da6b1b47d908244747167ae78c..7b32a099b29403f17aa9bd4746b8776e5b9272cc 100644 (file)
--- 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 7ab57ffec56606369be64d241894a69327dea52f..1cdb21b38b073ef952e35296f35eda08c601e941 100644 (file)
--- 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 \