summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-09-11 22:15:41 +0200
committerGitHub <noreply@github.com>2016-09-11 22:15:41 +0200
commitba3c47c696d9dd797a9053d77557259400b97586 (patch)
tree85a282dba85ffbf84f0168e444b09121ccba25cf
parentc40ab446c9bcd5b28a073fea4113794bb701937b (diff)
parentaad87ab1b6ef536837b7ce7a612dfc0ad422114b (diff)
Merge pull request #6446 from vnen/fix-scons-python-env
Fix the Windows environment in SCons spawn function
-rwxr-xr-xmethods.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/methods.py b/methods.py
index 8c99794d7a..c28ed55dda 100755
--- a/methods.py
+++ b/methods.py
@@ -1379,6 +1379,7 @@ def use_windows_spawn_fix(self, platform=None):
cmdline = cmd + " " + newargs
rv=0
+ env = {str(key): str(value) for key, value in env.iteritems()}
if len(cmdline) > 32000 and cmd.endswith("ar") :
cmdline = cmd + " " + args[1] + " " + args[2] + " "
for i in range(3,len(args)) :