From 5ee159e4b3122f3906845a7126e5cdf463a7d465 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Thu, 17 Aug 2017 22:10:52 +0100 Subject: [PATCH] Fix build when HAVE_LIBDRM isn't defined MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit make[4]: Entering directory '/wip/mesa/build/src/gallium/targets/dri' CXXLD gallium_dri.la ../../../../src/gallium/auxiliary/pipe-loader/.libs/libpipe_loader_static.a(libpipe_loader_static_la-pipe_loader.o): In function `pipe_loader_get_driinfo_xml': /mesa/build/src/gallium/auxiliary/pipe-loader/../../../../../src/gallium/auxiliary/pipe-loader/pipe_loader.c:117: undefined reference to `pipe_loader_drm_get_driinfo_xml' b4ff5e90 uses pipe_loader_get_driinfo_xml() unconditionally in pipe_loader.c, but it's definition in pipe_loader_get_driinfo_xml() is only built if HAVE_LIBDRM. Arrange to always use the default XML if HAVE_LIBDRM isn't defined. Signed-off-by: Jon Turney Reviewed-by: Nicolai Hähnle --- src/gallium/auxiliary/pipe-loader/pipe_loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c index 926db49fd24..e7cf9f86d99 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c @@ -114,7 +114,11 @@ pipe_loader_load_options(struct pipe_loader_device *dev) char * pipe_loader_get_driinfo_xml(const char *driver_name) { +#ifdef HAVE_LIBDRM char *xml = pipe_loader_drm_get_driinfo_xml(driver_name); +#else + char *xml = NULL; +#endif if (!xml) xml = strdup(gallium_driinfo_xml); -- 2.30.2