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.)

3 files changed, 4 insertions, 10 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'):
diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 3ac3112255c..31dfed316aa 100644
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -46,8 +46,6 @@ source = env.ParseSourceList('Makefile.sources', [
 ])
 
 if env['llvm']:
-    env.Append(CXXFLAGS = env['LLVM_CXXFLAGS'])
-
     source += env.ParseSourceList('Makefile.sources', [
         'GALLIVM_SOURCES',
         'GALLIVM_CPP_SOURCES'
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 71faee245c0..20500fd834f 100644
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -10,14 +10,13 @@ if not env['llvm']:
 env = env.Clone()
 
 llvmpipe = env.ConvenienceLibrary(
-    target = 'llvmpipe',
-    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
-)
-
-env.Append(CXXFLAGS = env['LLVM_CXXFLAGS'])
+	target = 'llvmpipe',
+	source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
+	)
 
 env.Alias('llvmpipe', llvmpipe)
 
+
 if not env['embedded']:
     env = env.Clone()