From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 13 Apr 2010 10:40:48 +0000 (+0900)
Subject: scons: Fix exception when llvm-config is not present.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cd4e5879ebd4fe71c5e95d83cdf4a2ebd2fd1e06;p=mesa.git

scons: Fix exception when llvm-config is not present.
---

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'