Mesa (master): scons: don' t set default_llvm on windows unles LLVM is defined

Keith Whitwell keithw at kemper.freedesktop.org
Wed May 19 12:36:48 UTC 2010


Module: Mesa
Branch: master
Commit: a536c204e289c46b0d493acfb4ebaf99f2b05189
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a536c204e289c46b0d493acfb4ebaf99f2b05189

Author: Keith Whitwell <keithw at vmware.com>
Date:   Wed May 19 13:27:31 2010 +0100

scons: don't set default_llvm on windows unles LLVM is defined

Otherwise we'll raise an error later in llvm.py

---

 common.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common.py b/common.py
index 742dabf..300e91a 100644
--- a/common.py
+++ b/common.py
@@ -39,7 +39,7 @@ if 'LLVM' in os.environ:
 else:
     default_llvm = 'no'
     try:
-        if subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
+        if env['platform'] != 'windows' and subprocess.call(['llvm-config', '--version'], stdout=subprocess.PIPE) == 0:
             default_llvm = 'yes'
     except:
         pass




More information about the mesa-commit mailing list