summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-10-25 13:52:58 -0700
committerKenneth Graunke <[email protected]>2010-10-27 12:49:53 -0700
commit3acc8265200295265b476222299a013791050b73 (patch)
tree4811cef085bbc52c51581036deca14a361d93502 /src/glsl
parent676c3f08bd13564c088ae85c3538ee0ee3c52599 (diff)
Fix build on systems where "python" is python 3.
First, it changes autoconf to use a "python2" binary when available, rather than plain "python" (which is ambiguous). Secondly, it changes the Makefiles to use $(PYTHON) $(PYTHON_FLAGS) rather than calling python directly. Signed-off-by: Xavier Chantry <[email protected]> Signed-off-by: Matthew William Cox <[email protected]> Signed-off-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 83869b1d846..4cfecb130f2 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -178,7 +178,7 @@ builtins: builtin_function.cpp builtins/profiles/* builtins/ir/* builtins/tools/
cp builtins/tools/builtin_function.cpp .
make glsl_compiler
@echo Regenerating builtin_function.cpp...
- ./builtins/tools/generate_builtins.py > builtin_function.cpp
+ $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py > builtin_function.cpp
@echo Rebuilding the real compiler...
make glsl_compiler