godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2546 from akien-mga/windows-stderr 

Hide stderr when trying to detect mingw binaries on posix
This commit is contained in:
Juan Linietsky 2015-09-27 11:41:44 -03:00
parent afbb0ca8d7 be51861310
commit f141df95a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/windows/detect.py
View File

@ -134,8 +134,8 @@ def can_build():
if (os.getenv("MINGW64_PREFIX")): if (os.getenv("MINGW64_PREFIX")):
mingw64=os.getenv("MINGW64_PREFIX") mingw64=os.getenv("MINGW64_PREFIX")
test = "gcc --version >/dev/null" test = "gcc --version &>/dev/null"
if os.system(mingw+test) == 0 or os.system(mingw64+test) ==0 or os.system(mingw32+test) ==0 : if (os.system(mingw+test) == 0 or os.system(mingw64+test) == 0 or os.system(mingw32+test) == 0):
return True return True
return False return False
@ -150,7 +150,7 @@ def get_opts():
mingw32 = "i686-w64-mingw32-" mingw32 = "i686-w64-mingw32-"
mingw64 = "x86_64-w64-mingw32-" mingw64 = "x86_64-w64-mingw32-"
if os.system(mingw32+"gcc --version >/dev/null") != 0 : if os.system(mingw32+"gcc --version &>/dev/null") != 0 :
mingw32 = mingw mingw32 = mingw
if (os.getenv("MINGW32_PREFIX")): if (os.getenv("MINGW32_PREFIX")):