From 4622c75dfbf5c89630d1860037dcb8b7910c0820 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 16 Jan 2017 15:45:34 +0000 Subject: [PATCH] i965: automake: include builddir prior to srcdir 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" Cc: Kenneth Graunke Signed-off-by: Emil Velikov --- 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 1b917e7bff7..c054a3c0f21 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.30.2