|
@@ -147,7 +147,7 @@ def can_build():
|
|
|
if (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):
|
|
|
return True
|
|
|
|
|
@@ -164,7 +164,7 @@ def get_opts():
|
|
|
mingw32 = "i686-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
|
|
|
|
|
|
if (os.getenv("MINGW32_PREFIX")):
|
|
@@ -330,18 +330,6 @@ def configure(env):
|
|
|
env.Append(LINKFLAGS=['-static'])
|
|
|
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"):
|
|
|
|
|
|
env.Append(CCFLAGS=['-msse2'])
|