|
@@ -21,10 +21,14 @@ def get_name():
|
|
|
|
|
|
|
|
|
|
def try_cmd(test, prefix, arch):
|
|
def try_cmd(test, prefix, arch):
|
|
|
|
+ archs = ["x86_64", "x86_32", "arm64", "arm32"]
|
|
if arch:
|
|
if arch:
|
|
|
|
+ archs = [arch]
|
|
|
|
+
|
|
|
|
+ for a in archs:
|
|
try:
|
|
try:
|
|
out = subprocess.Popen(
|
|
out = subprocess.Popen(
|
|
- get_mingw_bin_prefix(prefix, arch) + test,
|
|
|
|
|
|
+ get_mingw_bin_prefix(prefix, a) + test,
|
|
shell=True,
|
|
shell=True,
|
|
stderr=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
stdout=subprocess.PIPE,
|
|
stdout=subprocess.PIPE,
|
|
@@ -34,20 +38,6 @@ def try_cmd(test, prefix, arch):
|
|
return True
|
|
return True
|
|
except Exception:
|
|
except Exception:
|
|
pass
|
|
pass
|
|
- else:
|
|
|
|
- for a in ["x86_64", "x86_32", "arm64", "arm32"]:
|
|
|
|
- try:
|
|
|
|
- out = subprocess.Popen(
|
|
|
|
- get_mingw_bin_prefix(prefix, a) + test,
|
|
|
|
- shell=True,
|
|
|
|
- stderr=subprocess.PIPE,
|
|
|
|
- stdout=subprocess.PIPE,
|
|
|
|
- )
|
|
|
|
- out.communicate()
|
|
|
|
- if out.returncode == 0:
|
|
|
|
- return True
|
|
|
|
- except Exception:
|
|
|
|
- pass
|
|
|
|
|
|
|
|
return False
|
|
return False
|
|
|
|
|