diff options
author | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
commit | 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch) | |
tree | 193651a94adb3804e800747e993d07b92688e4d4 /mesalib/scons/llvm.py | |
parent | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff) | |
parent | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff) | |
download | vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/scons/llvm.py')
-rw-r--r-- | mesalib/scons/llvm.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py index d145de8d8..be7df9fad 100644 --- a/mesalib/scons/llvm.py +++ b/mesalib/scons/llvm.py @@ -132,6 +132,11 @@ def generate(env): # Some of the LLVM C headers use the inline keyword without # defining it. env.Append(CPPDEFINES = [('inline', '__inline')]) + # Match some of the warning options from llvm/cmake/modules/HandleLLVMOptions.cmake + env.AppendUnique(CXXFLAGS = [ + '/wd4355', # 'this' : used in base member initializer list + '/wd4624', # 'derived class' : destructor could not be generated because a base class destructor is inaccessible + ]) if env['build'] in ('debug', 'checked'): # LLVM libraries are static, build with /MT, and they # automatically link agains LIBCMT. When we're doing a |