mesa: Add MESA_FORMAT_ABGR2101010.

[mesa.git] / scons / llvm.py

diff --git a/scons/llvm.py b/scons/llvm.py
index 7cd609c2095482b4e6728edd709f5ca10ebf41f2..6282cb5382faeba571ab8584aefb6db77a65cebe 100644 (file)
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -190,16 +190,20 @@ def generate(env):
                 pass
             env.MergeFlags(cppflags)
 
+            # Match llvm --fno-rtti flag
+            cxxflags = env.backtick('llvm-config --cxxflags').split()
+            if '-fno-rtti' in cxxflags:
+                env.Append(CXXFLAGS = ['-fno-rtti'])
+
             components = ['engine', 'bitwriter', 'x86asmprinter']
 
             if llvm_version >= distutils.version.LooseVersion('3.1'):
                 components.append('mcjit')
 
-            if llvm_version >= distutils.version.LooseVersion('3.2'):
-                env.Append(CXXFLAGS = ('-fno-rtti',))
-
             env.ParseConfig('llvm-config --libs ' + ' '.join(components))
             env.ParseConfig('llvm-config --ldflags')
+            if llvm_version >= distutils.version.LooseVersion('3.5'):
+                env.ParseConfig('llvm-config --system-libs')
         except OSError:
             print 'scons: llvm-config version %s failed' % llvm_version
             return