From: Emil Velikov Date: Sat, 21 Nov 2015 19:43:09 +0000 (+0000) Subject: pipe-loader: link against libloader regardless of libdrm presence X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a6d4765880a2c9000970b2b6e584291090b1dc3;p=mesa.git pipe-loader: link against libloader regardless of libdrm presence Whether or not the loader has libdrm support is up-to it. Anyone using the loader should just include it whenever they depend on it. Cc: mesa-stable@lists.freedesktop.org Fixes: 0f39f9cb7ad "pipe-loader: add a dummy 'static' pipe-loader" Reported-by: Jon TURNEY Tested-by: Jon TURNEY Signed-off-by: Emil Velikov --- diff --git a/src/gallium/auxiliary/pipe-loader/Makefile.am b/src/gallium/auxiliary/pipe-loader/Makefile.am index f661897fdf7..8039a957b1b 100644 --- a/src/gallium/auxiliary/pipe-loader/Makefile.am +++ b/src/gallium/auxiliary/pipe-loader/Makefile.am @@ -37,12 +37,12 @@ libpipe_loader_static_la_SOURCES += \ libpipe_loader_dynamic_la_SOURCES += \ $(DRM_SOURCES) +endif + libpipe_loader_static_la_LIBADD = \ $(top_builddir)/src/loader/libloader.la libpipe_loader_dynamic_la_LIBADD = \ $(top_builddir)/src/loader/libloader.la -endif - EXTRA_DIST = SConscript