diff options
| author | Alexander von Gluck IV <[email protected]> | 2013-10-15 12:08:59 -0500 |
|---|---|---|
| committer | Alexander von Gluck IV <[email protected]> | 2013-10-15 22:12:18 -0500 |
| commit | 94d05bf87a21bd364e84f699a0064e5fba58a6f9 (patch) | |
| tree | 28bb968fc19f476bd83888802e9d65dab0a3f962 | |
| parent | 85d7f6779fb007e8d0530adbdb9dc97294a0b67e (diff) | |
scons: Fix build when rtti is disabled
* The rtti fix actually dug up a bug in the scons build scripts.
* Autotools took the LLVM cpp and cxx flags, while scons only took
the cpp flags.
* This grabs the cxx flags and applies them where needed. We may
want to make the same change for the llvm cpp flags in scons.
* The only linux platform I can find with LLVM no-rtti is Ubuntu.
* Fixes bug #70471
Tested-by: Vinson Lee <[email protected]>
| -rw-r--r-- | scons/llvm.py | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/SConscript | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/scons/llvm.py b/scons/llvm.py index c1c37362d3c..34b58910aa3 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -190,6 +190,9 @@ 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 31dfed316aa..3ac3112255c 100644 --- a/src/gallium/auxiliary/SConscript +++ b/src/gallium/auxiliary/SConscript @@ -46,6 +46,8 @@ 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 20500fd834f..71faee245c0 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -10,12 +10,13 @@ if not env['llvm']: env = env.Clone() llvmpipe = env.ConvenienceLibrary( - target = 'llvmpipe', - source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') - ) + target = 'llvmpipe', + source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') +) -env.Alias('llvmpipe', llvmpipe) +env.Append(CXXFLAGS = env['LLVM_CXXFLAGS']) +env.Alias('llvmpipe', llvmpipe) if not env['embedded']: env = env.Clone() |