From: Chad Versace Date: Thu, 8 Sep 2016 03:07:50 +0000 (-0700) Subject: anv: Link to libX11-xcb only when unneeded X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bad80c26e794d690914e7b16a29633e5f5a92a60;p=mesa.git anv: Link to libX11-xcb only when unneeded The Makefile unconditionally linked libX11-xcb into libvulkan_intel.so. But it's needed only if HAVE_PLATFORM_X11. Fixes build of libvulkan_intel.so on Chromium OS, which has no X11 libraries. Fixes: 71258e9462c ("anv/x11: Add support for Xlib platform") Cc: Kevin Strasser Reviewed-by: Jason Ekstrand Reviewed-by: Emil Velikov --- diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 2d20de944d4..cf16ea4e2b1 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -91,7 +91,9 @@ AM_CPPFLAGS += \ -DVK_USE_PLATFORM_XLIB_KHR VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES) -VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) + +# FIXME: Use pkg-config for X11-xcb ldflags. +VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb endif @@ -149,7 +151,7 @@ EXTRA_DIST = \ dev_icd.json.in \ intel_icd.json -libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS) -lX11-xcb +libvulkan_intel_la_LIBADD = $(VULKAN_LIB_DEPS) libvulkan_intel_la_LDFLAGS = \ -shared \ @@ -184,7 +186,7 @@ intel_icd.json : intel_icd.json.in # Libvulkan with dummy gem. Used for unit tests. libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES) -libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) -lX11-xcb +libvulkan_test_la_LIBADD = $(VULKAN_LIB_DEPS) include $(top_srcdir)/install-lib-links.mk