Mesa (master): winsys/amdgpu: Pull in LLVM CFLAGS

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9d8395bf0e4bfa6ef1344dbc9aebcf183aa9f9b5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d8395bf0e4bfa6ef1344dbc9aebcf183aa9f9b5

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Dec 19 15:58:23 2018 +0100

winsys/amdgpu: Pull in LLVM CFLAGS

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 <nicolai.haehnle at amd.com>

---

 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 e35fa2cd0a..1c2ec010fc 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 8b6f69b2bd..d3282ef412 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],
 )