Mesa (master): scons: use python3-compatible list-key check

Eric Engeström eric_engestrom at kemper.freedesktop.org
Mon Sep 25 11:58:35 UTC 2017


Module: Mesa
Branch: master
Commit: 29c8d755ea6fc97757db9ea28706e516a6b0d7f1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=29c8d755ea6fc97757db9ea28706e516a6b0d7f1

Author: Eric Engestrom <eric.engestrom at imgtec.com>
Date:   Tue Sep 19 14:09:43 2017 +0100

scons: use python3-compatible list-key check

These changes were generated using python's `2to3` tool.

Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 scons/gallium.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index e394bf8eab..94022df180 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




More information about the mesa-commit mailing list