diff options
| author | Chad Versace <chadversary@chromium.org> | 2016-09-07 20:07:50 -0700 |
|---|---|---|
| committer | Chad Versace <chadversary@chromium.org> | 2016-09-08 09:24:30 -0700 |
| commit | bad80c26e794d690914e7b16a29633e5f5a92a60 (patch) | |
| tree | 20eff63a232735b4b67c0c6af6ce0eeb4c9cabdf | |
| parent | 7514e326f89843fae75a385fee25809a852ca94d (diff) | |
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 <kevin.strasser@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
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 |