On 19.12.18 16:05, Michel Dänzer wrote:
From: Michel Dänzer <michel.daen...@amd.com>
Fixes build failure if the LLVM headers aren't in a standard include
directory.
Huh, interesting that I didn't run into this. Anyway:
Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
Fixes: ec22dd34c88f "radeonsi: move SI_FORCE_FAMILY functionality to
winsys"
Signed-off-by: Michel Dänzer <michel.daen...@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 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],
)
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
