Fix build when HAVE_LIBDRM isn't defined
authorJon Turney <jon.turney@dronecode.org.uk>
Thu, 17 Aug 2017 21:10:52 +0000 (22:10 +0100)
committerNicolai Hähnle <nicolai.haehnle@amd.com>
Fri, 18 Aug 2017 13:08:00 +0000 (15:08 +0200)
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 <jon.turney@dronecode.org.uk>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/gallium/auxiliary/pipe-loader/pipe_loader.c

index 926db49fd24b92ae35d475319be4e2844b061922..e7cf9f86d996f8414da28aff2e3fd398a5ec547f 100644 (file)
@@ -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);