diff options
| author | Jon Turney <[email protected]> | 2017-08-17 22:10:52 +0100 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-08-18 15:08:00 +0200 |
| commit | 5ee159e4b3122f3906845a7126e5cdf463a7d465 (patch) | |
| tree | c945e558441668a00c4094a165a1cc975a969344 | |
| parent | 5af7f1ccec956f054c3bacae91f4f2e7261e8e72 (diff) | |
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]>
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); |