Fix build failures for Android on Windows

The issue is caused by https://github.com/godotengine/godot/pull/64306 which makes use of a 3.7 feature while the current recommended python version is 3.5 for 3.x and 3.6 for master.

(cherry picked from commit 667f4ed742e0010adb678dff45e004310c4886d4)
This commit is contained in:
Fredia Huya-Kouadio 2022-08-31 12:36:54 -07:00 committed by Relintai
parent ba9d7d66fd
commit cddfcbab2c

View File

@ -378,16 +378,17 @@ def use_windows_spawn_fix(self, platform=None):
startupinfo = subprocess.STARTUPINFO() startupinfo = subprocess.STARTUPINFO()
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
proc = subprocess.Popen( popen_args = {
cmdline, "stdin": subprocess.PIPE,
stdin=subprocess.PIPE, "stdout": subprocess.PIPE,
stdout=subprocess.PIPE, "stderr": subprocess.PIPE,
stderr=subprocess.PIPE, "startupinfo": startupinfo,
startupinfo=startupinfo, "shell": False,
shell=False, "env": env,
env=env, }
text=True, if sys.version_info >= (3, 7, 0):
) popen_args["text"] = True
proc = subprocess.Popen(cmdline, **popen_args)
_, err = proc.communicate() _, err = proc.communicate()
rv = proc.wait() rv = proc.wait()
if rv: if rv: