Merge tag 'upstream/2.0.6'

Upstream version 2.0.6

1 files changed, 5 insertions, 5 deletions

diff --git a/SConstruct b/SConstruct
index 3d40050..88ea3f8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -713,11 +713,11 @@ if nix:
     env.Append( LIBS=[] )
 
     #make scons colorgcc friendly
-    env['ENV']['HOME'] = os.environ['HOME']
-    try:
-        env['ENV']['TERM'] = os.environ['TERM']
-    except KeyError:
-        pass
+    for key in ('HOME', 'TERM'):
+        try:
+            env['ENV'][key] = os.environ[key]
+        except KeyError:
+            pass
 
     if linux and has_option( "sharedclient" ):
         env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )