builtin_compiler/build: Don't use *_FOR_BUILD when not cross compiling
authorMatt Turner <mattst88@gmail.com>
Wed, 30 Jan 2013 19:50:55 +0000 (11:50 -0800)
committerMatt Turner <mattst88@gmail.com>
Mon, 4 Feb 2013 17:35:45 +0000 (09:35 -0800)
commit2db1f73849260cf8e5a7e390d04f5f26141a0b37
tree5c61b5ff725e7b330f5f83eef3d406fb16d3a598
parent805cf07dc3a3438abd81dde330daf382cc3a8844
builtin_compiler/build: Don't use *_FOR_BUILD when not cross compiling

Previously we were relying on CFLAGS_FOR_BUILD to be the same as CFLAGS
when not cross compiling, but this assumption didn't take into
consideration 32-bit builds on 64-bit systems. More generally, not
honoring CFLAGS is bad.

Automake is evidently too stupid to accept

if CROSS_COMPILING
CC = @CC_FOR_BUILD@
...
else
CC = @CC@
endif

without warning that CC has been already defined. The warnings are
harmless, but I'd prefer to avoid future reports about them, so define
proxy variables, which are assigned inside the conditional and then
unconditionally assigned to CC et al.

NOTE: This is a candidate for the 9.1 branch.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59737
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60038
src/glsl/builtin_compiler/Makefile.am