From: Benjamin Close Date: Wed, 25 Feb 2009 04:51:11 +0000 (-0800) Subject: gallium: Fix build when exiting CFLAGS contains a path with different gl.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=afe139f629251f38afd5b477d5b00f47d17da60f;p=mesa.git 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 --- diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile index ea4cec0bb84..d266ae2d628 100644 --- 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} #############################################