Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-10 13:57:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into wip

Browse Source
This commit is contained in:
Robin Dunn
2015-03-17 18:03:20 -07:00
parent 2c20cce983 22cc6b665e
commit 53815d8ec2
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build.py
View File

@@ -497,13 +497,14 @@ def getTool(cmdName, version, MD5, envVar, platformBinary):
print(' expected "%s"' % md5)
print(' Set %s in the environment to use a local build of %s instead' % (envVar, cmdName))
sys.exit(1)
try:
p = subprocess.Popen([cmd, '--help'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os.environ)
p.wait()
except OSError, e:
print('ERROR: Could not execute %s, got "%s"' % (cmd, e))
print(' Set %s in the environment to use a local build of %s instead' % (envVar, cmdName))
sys.exit(1)
if platformBinary:
try:
p = subprocess.Popen([cmd, '--help'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=os.environ)
p.wait()
except OSError, e:
print('ERROR: Could not execute %s, got "%s"' % (cmd, e))
print(' Set %s in the environment to use a local build of %s instead' % (envVar, cmdName))
sys.exit(1)
return cmd
msg('Not found. Attempting to download...')