Mesa (master): scons: Fix exception when llvm-config is not present.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Tue Apr 13 10:42:44 UTC 2010
Module: Mesa
Branch: master
Commit: cd4e5879ebd4fe71c5e95d83cdf4a2ebd2fd1e06
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd4e5879ebd4fe71c5e95d83cdf4a2ebd2fd1e06
Author: José Fonseca <jfonseca at vmware.com>
Date: Tue Apr 13 19:40:48 2010 +0900
scons: Fix exception when llvm-config is not present.
---
common.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/common.py b/common.py
index 8372176..742dabf 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'
More information about the mesa-commit
mailing list