gallium: Fix build when exiting CFLAGS contains a path with different gl.h

If a path is in CFLAGS when building and that path contains gl.h
then the wrong gl.h is used when building. This can lead to very
confusing errors. The solution is rather than postpend the CFLAGS
we prepend the paths as expected allowing compilation to occur
as intended

Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>

diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index ea4cec0bb84ba97bd5a930707cfbfac6fb9ec7e3..d266ae2d6281c3e84bf5d5cdf0a9f98786aab284 100644 (file)
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -6,14 +6,15 @@ TOP        = ../../../..
 
 include ${TOP}/configs/current
 
-CFLAGS += -g -Wall -Werror-implicit-function-declaration -fPIC \
+CFLAGS:= -g -Wall -Werror-implicit-function-declaration -fPIC \
           -I${GALLIUMDIR}/include \
           -I${GALLIUMDIR}/auxiliary \
           -I${TOP}/src/mesa/drivers/dri/common \
           -I${TOP}/src/mesa \
           -I$(TOP)/include \
           -I$(TOP)/src/egl/main \
-          ${LIBDRM_CFLAGS}
+          ${LIBDRM_CFLAGS} \
+          ${CFLAGS}
 
 #############################################