Mesa (master): scons: Simplified fix of llvm cxxflags for rtti

Alexander von Gluck IV kallisti5 at kemper.freedesktop.org
Fri Oct 18 01:32:07 UTC 2013


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

Author: Alexander von Gluck IV <kallisti5 at unixzen.com>
Date:   Wed Oct 16 20:24:13 2013 -0500

scons: Simplified fix of llvm cxxflags for rtti

* Based on ideas of Jose Fonseca
* A rework of ce8eadb6e8

Tested-by: Vinson Lee <vlee at freedesktop.org>

---

 scons/llvm.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/scons/llvm.py b/scons/llvm.py
index c1c3736..8388d8e 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -190,6 +190,11 @@ 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'):




More information about the mesa-commit mailing list