*** mesa/src/glsl/builtin_compiler/Makefile.am	2013-01-29 18:56:06.801216986 +0100
--- mesa-build/src/glsl/builtin_compiler/Makefile.am	2013-02-02 13:15:56.673496253 +0100
***************
*** 20,42 ****
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  # IN THE SOFTWARE.
  
- CC = @CC_FOR_BUILD@
- CFLAGS = @CFLAGS_FOR_BUILD@
- CPP = @CPP_FOR_BUILD@
- CPPFLAGS = @CPPFLAGS_FOR_BUILD@
- CXX = @CXX_FOR_BUILD@
- CXXFLAGS = @CXXFLAGS_FOR_BUILD@
- LD = @LD_FOR_BUILD@
- LDFLAGS = @LDFLAGS_FOR_BUILD@
- 
  AM_CFLAGS = \
  	-I $(top_srcdir)/include \
  	-I $(top_srcdir)/src/mapi \
  	-I $(top_srcdir)/src/mesa \
  	-I $(GLSL_SRCDIR) \
  	-I $(GLSL_SRCDIR)/glcpp \
! 	-I $(GLSL_BUILDDIR) \
! 	$(DEFINES_FOR_BUILD)
  
  AM_CXXFLAGS = $(AM_CFLAGS)
  
--- 20,63 ----
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  # IN THE SOFTWARE.
  
  AM_CFLAGS = \
  	-I $(top_srcdir)/include \
  	-I $(top_srcdir)/src/mapi \
  	-I $(top_srcdir)/src/mesa \
  	-I $(GLSL_SRCDIR) \
  	-I $(GLSL_SRCDIR)/glcpp \
! 	-I $(GLSL_BUILDDIR)
! 
! if CROSS_COMPILING
! 	proxyCC = @CC_FOR_BUILD@
! 	proxyCFLAGS = @CFLAGS_FOR_BUILD@
! 	proxyCPP = @CPP_FOR_BUILD@
! 	proxyCPPFLAGS = @CPPFLAGS_FOR_BUILD@
! 	proxyCXX = @CXX_FOR_BUILD@
! 	proxyCXXFLAGS = @CXXFLAGS_FOR_BUILD@
! 	proxyLD = @LD_FOR_BUILD@
! 	proxyLDFLAGS = @LDFLAGS_FOR_BUILD@
! 	AM_CFLAGS += $(DEFINES_FOR_BUILD)
! else
! 	proxyCC = @CC@
! 	proxyCFLAGS = @CFLAGS@
! 	proxyCPP = @CPP@
! proxyCPPFLAGS = @CPPFLAGS@
! 	proxyCXX = @CXX@
! 	proxyCXXFLAGS = @CXXFLAGS@
! 	proxyLD = @LD@
! 	proxyLDFLAGS = @LDFLAGS@
! 	AM_CFLAGS += $(DEFINES)
! endif
! 
! CC = $(proxyCC)
! CFLAGS = $(proxyCFLAGS)
! CPP = $(proxyCPP)
! CPPFLAGS = $(proxyCPPFLAGS)
! CXX = $(proxyCXX)
! CXXFLAGS = $(proxyCXXFLAGS)
! LD = $(proxyLD)
! LDFLAGS = $(proxyLDFLAGS)
  
  AM_CXXFLAGS = $(AM_CFLAGS)