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>
This commit is contained in:
Eric Engestrom
2017-09-19 14:09:43 +01:00
parent 7d48219b3a
commit 29c8d755ea

View File

@@ -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