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 667f4ed742
)
This commit is contained in:
parent
105e8a8111
commit
8d22a5f4c0
1 changed files with 11 additions and 10 deletions
21
methods.py
21
methods.py
|
@ -325,16 +325,17 @@ def use_windows_spawn_fix(self, platform=None):
|
|||
|
||||
startupinfo = subprocess.STARTUPINFO()
|
||||
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
|
||||
proc = subprocess.Popen(
|
||||
cmdline,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
startupinfo=startupinfo,
|
||||
shell=False,
|
||||
env=env,
|
||||
text=True,
|
||||
)
|
||||
popen_args = {
|
||||
"stdin": subprocess.PIPE,
|
||||
"stdout": subprocess.PIPE,
|
||||
"stderr": subprocess.PIPE,
|
||||
"startupinfo": startupinfo,
|
||||
"shell": False,
|
||||
"env": env,
|
||||
}
|
||||
if sys.version_info >= (3, 7, 0):
|
||||
popen_args["text"] = True
|
||||
proc = subprocess.Popen(cmdline, **popen_args)
|
||||
_, err = proc.communicate()
|
||||
rv = proc.wait()
|
||||
if rv:
|
||||
|
|
Loading…
Reference in a new issue