[Mesa-dev] [PATCH 03/19] i965: automake: include builddir prior to srcdir

Emil Velikov emil.l.velikov at gmail.com
Mon Jan 16 15:45:34 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

The latter can contain stale generated file, which, as-is, we'll end up
using.

Fixes: bfd17c76c12 "i965: Port INTEL_PRECISE_TRIG=1 to NIR."
Cc: "12.0 13.0" <mesa-dev at lists.freedesktop.org>
Cc: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
Strictly speaking not introduced with the above commit.
---
 src/mesa/drivers/dri/i965/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 92cb5b5ba0..1fb7485ffa 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -30,15 +30,15 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/mesa/ \
 	-I$(top_srcdir)/src/gallium/include \
 	-I$(top_srcdir)/src/gallium/auxiliary \
+	-I$(top_builddir)/src/mesa/drivers/dri/common \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
 	-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
 	-I$(top_srcdir)/src/gtest/include \
-	-I$(top_srcdir)/src/compiler/nir \
-	-I$(top_srcdir)/src/intel \
 	-I$(top_builddir)/src/compiler/glsl \
 	-I$(top_builddir)/src/compiler/nir \
+	-I$(top_srcdir)/src/compiler/nir \
 	-I$(top_builddir)/src/intel \
-	-I$(top_builddir)/src/mesa/drivers/dri/common \
+	-I$(top_srcdir)/src/intel \
 	$(DEFINES) \
 	$(VISIBILITY_CFLAGS) \
 	$(INTEL_CFLAGS)
-- 
2.11.0



More information about the mesa-dev mailing list