godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Make MinGW test less verbose on non-Bash shells

Browse Source 
The &> construct seems to be Bash-specific.
Supersedes #9755.

(cherry picked from commit 9f768cb519)
This commit is contained in:
Rémi Verschelde
2017-07-25 20:44:16 +02:00
parent 7459c43750
commit 437cac9f55
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/windows/detect.py
View File

@@ -147,7 +147,7 @@ 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 2>&1"
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
@@ -164,7 +164,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 2>&1") != 0:
mingw32 = mingw mingw32 = mingw
if (os.getenv("MINGW32_PREFIX")): if (os.getenv("MINGW32_PREFIX")):
@@ -330,18 +330,6 @@ def configure(env):
env.Append(LINKFLAGS=['-static']) env.Append(LINKFLAGS=['-static'])
mingw_prefix = env["mingw_prefix_64"] mingw_prefix = env["mingw_prefix_64"]
nulstr = ""
if (os.name == "posix"):
nulstr = ">/dev/null"
else:
nulstr = ">nul"
# if os.system(mingw_prefix+"gcc --version"+nulstr)!=0:
# #not really super consistent but..
# print("Can't find Windows compiler: "+mingw_prefix)
# sys.exit(255)
if (env["target"] == "release"): if (env["target"] == "release"):
env.Append(CCFLAGS=['-msse2']) env.Append(CCFLAGS=['-msse2'])