summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-04-13 19:40:48 +0900
committerJosé Fonseca <jfonseca@vmware.com>2010-04-13 19:42:29 +0900
commitcd4e5879ebd4fe71c5e95d83cdf4a2ebd2fd1e06 (patch)
tree8899bd2ca53d60d31070ac02d261f2b8b9d71ff4
parentddc42b6380d0380a6f519df268a8b3531ddb81fb (diff)
scons: Fix exception when llvm-config is not present.
-rw-r--r--common.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/common.py b/common.py
index 8372176edd7..742dabf4c45 100644
--- a/common.py
+++ b/common.py
@@ -34,10 +34,15 @@ else:
default_machine = _platform.machine()
default_machine = _machine_map.get(default_machine, 'generic')
-if 'LLVM' in os.environ or subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
+if 'LLVM' in os.environ:
default_llvm = 'yes'
else:
default_llvm = 'no'
+ try:
+ if subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
+ default_llvm = 'yes'
+ except:
+ pass
if default_platform in ('linux', 'freebsd'):
default_dri = 'yes'