Module: Mesa Branch: master Commit: 5ee159e4b3122f3906845a7126e5cdf463a7d465 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ee159e4b3122f3906845a7126e5cdf463a7d465
Author: Jon Turney <[email protected]> Date: Thu Aug 17 22:10:52 2017 +0100 Fix build when HAVE_LIBDRM isn't defined 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 <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]> --- 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 926db49fd2..e7cf9f86d9 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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
