summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@imgtec.com>2017-09-19 14:09:43 +0100
committerEric Engestrom <eric.engestrom@imgtec.com>2017-09-25 11:58:53 +0100
commit29c8d755ea6fc97757db9ea28706e516a6b0d7f1 (patch)
tree3af5b21dd1c3ad07f693b102a395bebe61afa634 /scons
parent7d48219b3ac78895315ea6cef3ced3e55d3d92f0 (diff)
downloadmesa-29c8d755ea6fc97757db9ea28706e516a6b0d7f1.tar.gz
mesa-29c8d755ea6fc97757db9ea28706e516a6b0d7f1.tar.bz2
mesa-29c8d755ea6fc97757db9ea28706e516a6b0d7f1.zip
scons: use python3-compatible list-key check
These changes were generated using python's `2to3` tool. Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Diffstat (limited to 'scons')
-rwxr-xr-xscons/gallium.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index e394bf8eabf..94022df1808 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -193,15 +193,15 @@ def generate(env):
env.Tool(env['toolchain'])
# Allow override compiler and specify additional flags from environment
- if os.environ.has_key('CC'):
+ if 'CC' in os.environ:
env['CC'] = os.environ['CC']
- if os.environ.has_key('CFLAGS'):
+ if 'CFLAGS' in os.environ:
env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
- if os.environ.has_key('CXX'):
+ if 'CXX' in os.environ:
env['CXX'] = os.environ['CXX']
- if os.environ.has_key('CXXFLAGS'):
+ if 'CXXFLAGS' in os.environ:
env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
- if os.environ.has_key('LDFLAGS'):
+ if 'LDFLAGS' in os.environ:
env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
# Detect gcc/clang not by executable name, but through pre-defined macros