From 9948a33653088c2b9409f12924857643989657a5 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Fri, 19 Oct 2012 14:03:01 +0200 Subject: 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 Acked-by: Kenneth Graunke --- src/glsl/builtin_compiler/.gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/glsl/builtin_compiler/.gitignore (limited to 'src/glsl/builtin_compiler/.gitignore') diff --git a/src/glsl/builtin_compiler/.gitignore b/src/glsl/builtin_compiler/.gitignore new file mode 100644 index 00000000000..40c551baa22 --- /dev/null +++ b/src/glsl/builtin_compiler/.gitignore @@ -0,0 +1,6 @@ +builtin_compiler +glcpp-lex.c +glcpp-parse.c +glcpp-parse.h +glcpp-parse.output +/Makefile -- cgit v1.2.3