summaryrefslogtreecommitdiffstats
path: root/scons
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2015-03-19 22:09:20 +0000
committerJose Fonseca <jfonseca@vmware.com>2015-03-22 08:23:24 +0000
commite518d97d7e8136384d5310235e2dd295170bfdcd (patch)
treea9fd0b2ce40c88f90e65dfdf4a8b7142df71165e /scons
parent31e47a59ad542c72a56f1eee1b402b23d42e4475 (diff)
downloadexternal_mesa3d-e518d97d7e8136384d5310235e2dd295170bfdcd.zip
external_mesa3d-e518d97d7e8136384d5310235e2dd295170bfdcd.tar.gz
external_mesa3d-e518d97d7e8136384d5310235e2dd295170bfdcd.tar.bz2
scons: Match some of LLVM warning options.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'scons')
-rw-r--r--scons/llvm.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index d145de8..be7df9f 100644
--- a/scons/llvm.py
+++ b/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