diff options
| author | Thierry Reding <[email protected]> | 2012-10-19 14:03:01 +0200 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-11-01 18:18:21 -0700 |
| commit | 9948a33653088c2b9409f12924857643989657a5 (patch) | |
| tree | 3b81d0caf60245caaa27cbbfd4edbb1518a82cbb /src/glsl/.gitignore | |
| parent | 8d3fb1be6bd61e59fa241d6422419119956b7d90 (diff) | |
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 <[email protected]>
Acked-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl/.gitignore')
| -rw-r--r-- | src/glsl/.gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/glsl/.gitignore b/src/glsl/.gitignore index 81240b95254..068d4874b3f 100644 --- a/src/glsl/.gitignore +++ b/src/glsl/.gitignore @@ -4,6 +4,5 @@ glsl_parser.cc glsl_parser.h glsl_parser.output builtin_function.cpp -builtin_compiler glsl_test /Makefile |