aboutsummaryrefslogtreecommitdiff
path: root/mesalib/scons
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-18 11:23:37 +0200
committermarha <marha@users.sourceforge.net>2013-10-18 11:23:37 +0200
commitb8a77c943fa53005b6cdb1ab792acf5ff0a131be (patch)
treee10b1a509f6773de3e547ac5332cf6e0a4e07617 /mesalib/scons
parent9e23b44bfe1e6e85231b1c07d945cadf0c868648 (diff)
downloadvcxsrv-b8a77c943fa53005b6cdb1ab792acf5ff0a131be.tar.gz
vcxsrv-b8a77c943fa53005b6cdb1ab792acf5ff0a131be.tar.bz2
vcxsrv-b8a77c943fa53005b6cdb1ab792acf5ff0a131be.zip
mesa pixman git update 18 okt 2013
pixman commit 3c2f4b651747c1ac484c39d5128cae5483094342 mesa commit 9aad1ba70fad7bfa45778faa5a91235f8302264f
Diffstat (limited to 'mesalib/scons')
-rw-r--r--mesalib/scons/llvm.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py
index 34b58910a..8388d8e9f 100644
--- a/mesalib/scons/llvm.py
+++ b/mesalib/scons/llvm.py
@@ -190,8 +190,10 @@ def generate(env):
pass
env.MergeFlags(cppflags)
- cxxflags = env.backtick('llvm-config --cxxflags').rstrip()
- env.Append(LLVM_CXXFLAGS = cxxflags)
+ # 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']