diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
| commit | 2112b7dec49833ba872bd3ebcd7288930fec0796 (patch) | |
| tree | 407c80c9a70f590af2d4c3e5c14678827e189331 /mesalib/scons | |
| parent | 8badbdef38ce843dc443ddee219eda4040ef2cd5 (diff) | |
| parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
| download | vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.gz vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.bz2 vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'mesalib/scons')
| -rw-r--r-- | mesalib/scons/llvm.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py index 6282cb538..134a0728e 100644 --- a/mesalib/scons/llvm.py +++ b/mesalib/scons/llvm.py @@ -204,6 +204,7 @@ def generate(env): env.ParseConfig('llvm-config --ldflags') if llvm_version >= distutils.version.LooseVersion('3.5'): env.ParseConfig('llvm-config --system-libs') + env.Append(CXXFLAGS = ['-std=c++11']) except OSError: print 'scons: llvm-config version %s failed' % llvm_version return |