Use "env -" instead of "env -i". (Chad Austin)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@902 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index e75d50da239cefac01df25de2c98b8026225fd4c..885c744dc74ffc51b55832ad290e5caa365c3e36 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -33,6 +33,9 @@ RELEASE 0.95 - XXX
 
   - More robust handling of data in VCComponents.dat.
 
+  - If the "env" command is available, spawn commands with the more
+    general "env -" instead of "env -i".
+
   From Kerim Borchaev:
 
   - Fix a typo in a msvc.py's registry lookup:  "VCComponents.dat", not

diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
index e6b4b159198259e362e5445203d26d8744de4600..bc121e6c885bb638eda9f75144e4188ec4f841d4 100644 (file)
--- a/src/engine/SCons/Platform/posix.py
+++ b/src/engine/SCons/Platform/posix.py
@@ -59,7 +59,7 @@ def escape(arg):
 
 def _get_env_command(sh, escape, cmd, args, env):
     if env:
-        s = 'env -i '
+        s = 'env - '
         for key in env.keys():
             s = s + '%s=%s '%(key, escape(env[key]))
         s = s + sh + ' -c '