Attachment 87648 Details for Bug 70471 – fix revision 1

fix revision 1

scons-llvm-cxxfix-revision1.diff (text/plain), 1.55 KB, created by Alexander von Gluck on 2013-10-15 07:26:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander von Gluck

Created: 2013-10-15 07:26:00 UTC

Size: 1.55 KB

patch

obsolete

>diff --git a/scons/llvm.py b/scons/llvm.py
>index c1c3736..34b5891 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 31dfed3..3ac3112 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 20500fd..71faee2 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()

Actions: View

Attachments on bug 70471: 87648

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.