From 9d8395bf0e4bfa6ef1344dbc9aebcf183aa9f9b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Wed, 19 Dec 2018 15:58:23 +0100 Subject: [PATCH] winsys/amdgpu: Pull in LLVM CFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes build failure if the LLVM headers aren't in a standard include directory. Fixes: ec22dd34c88f "radeonsi: move SI_FORCE_FAMILY functionality to winsys" Reviewed-by: Nicolai Hähnle --- src/gallium/winsys/amdgpu/drm/Makefile.am | 1 + src/gallium/winsys/amdgpu/drm/meson.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gallium/winsys/amdgpu/drm/Makefile.am b/src/gallium/winsys/amdgpu/drm/Makefile.am index e35fa2cd0a2..1c2ec010fc6 100644 --- a/src/gallium/winsys/amdgpu/drm/Makefile.am +++ b/src/gallium/winsys/amdgpu/drm/Makefile.am @@ -4,6 +4,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ $(GALLIUM_WINSYS_CFLAGS) \ $(AMDGPU_CFLAGS) \ + $(LLVM_CFLAGS) \ -I$(top_srcdir)/src/amd/ AM_CXXFLAGS = $(AM_CFLAGS) diff --git a/src/gallium/winsys/amdgpu/drm/meson.build b/src/gallium/winsys/amdgpu/drm/meson.build index 8b6f69b2bdd..d3282ef412d 100644 --- a/src/gallium/winsys/amdgpu/drm/meson.build +++ b/src/gallium/winsys/amdgpu/drm/meson.build @@ -31,5 +31,5 @@ libamdgpuwinsys = static_library( c_args : [c_vis_args], cpp_args : [cpp_vis_args], link_with : libamdgpu_addrlib, - dependencies : dep_libdrm_amdgpu, + dependencies : [dep_llvm, dep_libdrm_amdgpu], ) -- 2.30.2