Fix the Windows environment in SCons spawn function

Properly fix #2974 as discussed there.

(cherry picked from commit aad87ab1b6)
This commit is contained in:
George Marques 2016-09-10 12:08:04 -03:00 committed by Rémi Verschelde
parent 75f51aece9
commit ee23649813

View file

@ -1377,6 +1377,7 @@ def use_windows_spawn_fix(self, platform=None):
cmdline = cmd + " " + newargs cmdline = cmd + " " + newargs
rv=0 rv=0
env = {str(key): str(value) for key, value in env.iteritems()}
if len(cmdline) > 32000 and cmd.endswith("ar") : if len(cmdline) > 32000 and cmd.endswith("ar") :
cmdline = cmd + " " + args[1] + " " + args[2] + " " cmdline = cmd + " " + args[1] + " " + args[2] + " "
for i in range(3,len(args)) : for i in range(3,len(args)) :