From: Eric Engestrom Date: Tue, 19 Sep 2017 13:09:43 +0000 (+0100) Subject: scons: use python3-compatible list-key check X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=29c8d755ea6fc97757db9ea28706e516a6b0d7f1;p=mesa.git scons: use python3-compatible list-key check These changes were generated using python's `2to3` tool. Signed-off-by: Eric Engestrom --- 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