Merge branch '7.8'

[mesa.git] / scons / llvm.py

diff --git a/scons/llvm.py b/scons/llvm.py
index 88a63854bc6d1fffa470bb55049bb1b6f1e6f7e1..c8e50c5916d1e0fd54d06a363e411cb1a7158228 100644 (file)
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -76,11 +76,17 @@ def generate(env):
             mo = llvm_version_re.match(line)
             if mo:
                 llvm_version = mo.group(1)
+                llvm_version = distutils.version.LooseVersion(llvm_version)
                 break
         if llvm_version is None:
             print 'scons: could not determine the LLVM version from %s' % llvm_config
             return
 
+        if llvm_version >= distutils.version.LooseVersion('2.7'):
+            print 'scons: Ignoring unsupported LLVM version %s' % llvm_version
+            print 'scons: See http://www.llvm.org/bugs/show_bug.cgi?id=6429'
+            return
+
         env.Prepend(CPPPATH = [os.path.join(llvm_dir, 'include')])
         env.AppendUnique(CPPDEFINES = [
             '__STDC_LIMIT_MACROS', 
@@ -130,6 +136,12 @@ def generate(env):
                 env.Append(LINKFLAGS = ['/nodefaultlib:LIBCMT'])
     elif env.Detect('llvm-config'):
         llvm_version = env.backtick('llvm-config --version').rstrip()
+        llvm_version = distutils.version.LooseVersion(llvm_version)
+
+        if llvm_version >= distutils.version.LooseVersion('2.7'):
+            print 'scons: Ignoring unsupported LLVM version %s' % llvm_version
+            print 'scons: See http://www.llvm.org/bugs/show_bug.cgi?id=6429'
+            return
 
         try:
             env.ParseConfig('llvm-config --cppflags')
@@ -145,7 +157,6 @@ def generate(env):
     assert llvm_version is not None
 
     print 'scons: Found LLVM version %s' % llvm_version
-    llvm_version = distutils.version.LooseVersion(llvm_version)
     env['LLVM_VERSION'] = llvm_version
 
     # Define HAVE_LLVM macro with the major/minor version number (e.g., 0x0206 for 2.6)