diff options
| author | Emil Velikov <[email protected]> | 2018-08-16 13:59:38 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-10-31 19:15:50 +0000 |
| commit | 986033a2750c1160a4cef3c8418fc7f9e2b4fb5a (patch) | |
| tree | 272f346932d8d545e79213feeab07d610fa3dfbd /src/compiler | |
| parent | 6d7d3dbda531b0bc692ffb479d65527b2138dbf3 (diff) | |
configure: allow building with python3
Pretty much all of the scripts are python2+3 compatible.
Check and allow using python3, while adjusting the PYTHON2 refs.
Note:
- python3.4 is used as it's the earliest supported version
- python2 chosen prior to python3
v2: use python2 by default
Cc: Ilia Mirkin <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/Makefile.am | 2 | ||||
| -rw-r--r-- | src/compiler/Makefile.glsl.am | 2 | ||||
| -rwxr-xr-x | src/compiler/glsl/glcpp/tests/glcpp-test.sh | 2 | ||||
| -rwxr-xr-x | src/compiler/glsl/tests/optimization-test.sh | 2 | ||||
| -rwxr-xr-x | src/compiler/glsl/tests/warnings-test.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am index 73435a3b5d6..05cdb1446c0 100644 --- a/src/compiler/Makefile.am +++ b/src/compiler/Makefile.am @@ -68,7 +68,7 @@ EXTRA_DIST = \ meson.build MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) -PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) +PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS) include Makefile.spirv.am diff --git a/src/compiler/Makefile.glsl.am b/src/compiler/Makefile.glsl.am index 02a7f432150..a323f7b05bc 100644 --- a/src/compiler/Makefile.glsl.am +++ b/src/compiler/Makefile.glsl.am @@ -41,7 +41,7 @@ TESTS += glsl/glcpp/tests/glcpp-test.sh \ TESTS_ENVIRONMENT= \ export abs_builddir=$(abs_builddir); \ - export PYTHON2=$(PYTHON2); \ + export PYTHON=$(PYTHON); \ export PYTHON_FLAGS=$(PYTHON_FLAGS); check_PROGRAMS += \ diff --git a/src/compiler/glsl/glcpp/tests/glcpp-test.sh b/src/compiler/glsl/glcpp/tests/glcpp-test.sh index b8397ec8902..666a617bfb1 100755 --- a/src/compiler/glsl/glcpp/tests/glcpp-test.sh +++ b/src/compiler/glsl/glcpp/tests/glcpp-test.sh @@ -13,4 +13,4 @@ if [ -z "$srcdir" -o -z "$abs_builddir" ]; then abs_builddir=`pwd`/../../../ fi -$PYTHON2 $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro +$PYTHON $srcdir/glsl/glcpp/tests/glcpp_test.py $abs_builddir/glsl/glcpp/glcpp $srcdir/glsl/glcpp/tests --unix --windows --oldmac --bizarro diff --git a/src/compiler/glsl/tests/optimization-test.sh b/src/compiler/glsl/tests/optimization-test.sh index 410ed262ef0..751529a5159 100755 --- a/src/compiler/glsl/tests/optimization-test.sh +++ b/src/compiler/glsl/tests/optimization-test.sh @@ -1,3 +1,3 @@ #!/bin/sh -$PYTHON2 $srcdir/glsl/tests/optimization_test.py --test-runner $abs_builddir/glsl/glsl_test +$PYTHON $srcdir/glsl/tests/optimization_test.py --test-runner $abs_builddir/glsl/glsl_test diff --git a/src/compiler/glsl/tests/warnings-test.sh b/src/compiler/glsl/tests/warnings-test.sh index 09b6bb2fc98..12f68c2300f 100755 --- a/src/compiler/glsl/tests/warnings-test.sh +++ b/src/compiler/glsl/tests/warnings-test.sh @@ -1,3 +1,3 @@ #!/bin/sh -$PYTHON2 $srcdir/glsl/tests/warnings_test.py --glsl-compiler $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/ +$PYTHON $srcdir/glsl/tests/warnings_test.py --glsl-compiler $abs_builddir/glsl_compiler --test-directory $srcdir/glsl/tests/warnings/ |