summaryrefslogtreecommitdiffstats
path: root/scons
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2013-10-16 15:05:51 -0700
committerJosé Fonseca <[email protected]>2013-10-16 15:05:51 -0700
commit40ddd8b659db1224ce6a0fe6db786b1551ce88ee (patch)
treeb7d36bb1cafc0de06af3bd33158baf7144d7c43c /scons
parent9da4021626dd48a1cc25054d1d4009e098f4d97b (diff)
Revert "scons: Fix build when rtti is disabled"
This reverts commit 94d05bf87a21bd364e84f699a0064e5fba58a6f9 as it has a few problems: - it breaks windows builds becuase env[LLVM_CXXFLAGS] is never set there - it is merging not only rtti, but the whole cxxflags (defines etc) which has proven to be a source of troubles (breaks debugging etc.)
Diffstat (limited to 'scons')
-rw-r--r--scons/llvm.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index 34b58910aa3..c1c37362d3c 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -190,9 +190,6 @@ def generate(env):
pass
env.MergeFlags(cppflags)
- cxxflags = env.backtick('llvm-config --cxxflags').rstrip()
- env.Append(LLVM_CXXFLAGS = cxxflags)
-
components = ['engine', 'bitwriter', 'x86asmprinter']
if llvm_version >= distutils.version.LooseVersion('3.1'):