build: Don't cross-compile GLSL builtin compiler
authorThierry Reding <thierry.reding@avionic-design.de>
Fri, 19 Oct 2012 12:03:01 +0000 (14:03 +0200)
committerKenneth Graunke <kenneth@whitecape.org>
Fri, 2 Nov 2012 01:18:21 +0000 (18:18 -0700)
commit9948a33653088c2b9409f12924857643989657a5
tree3b81d0caf60245caaa27cbbfd4edbb1518a82cbb
parent8d3fb1be6bd61e59fa241d6422419119956b7d90
build: Don't cross-compile GLSL builtin compiler

The builtin_compiler binary is used during the build process to generate
code for the builtin GLSL functions. Since this binary needs to be run
on the build host, it must not be cross-compiled.

This patch fixes the build system to compile a second version of the
source files and the builtin_compiler binary itself for the build
system. It does so by defining the CC_FOR_BUILD and CXX_FOR_BUILD
variables, which are searched for by the configure script and point to
the location of native C and C++ compilers.

In order for this to work properly, builtin_function.cpp is removed
from BUILT_SOURCES, otherwise the build system would try to generate it
before having had a chance to descend into the builtin_compiler
subdirectory. With the builtin_compiler and glsl_compiler now being
generated at different stages, the build instructions for glsl_compiler
can be simplified a bit.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
configure.ac
m4/ax_prog_cc_for_build.m4 [new file with mode: 0644]
m4/ax_prog_cxx_for_build.m4 [new file with mode: 0644]
src/glsl/.gitignore
src/glsl/Makefile.am
src/glsl/builtin_compiler/.gitignore [new file with mode: 0644]
src/glsl/builtin_compiler/Makefile.am [new file with mode: 0644]
src/glsl/builtin_compiler/builtin_stubs.cpp [new file with mode: 0644]
src/glsl/builtin_stubs.cpp [deleted file]