From 40ddd8b659db1224ce6a0fe6db786b1551ce88ee Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Wed, 16 Oct 2013 15:05:51 -0700 Subject: 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.) --- scons/llvm.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'scons') 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'): -- cgit v1.2.3