From: Jose Fonseca <jfonseca@vmware.com>
Date: Thu, 19 Mar 2015 22:09:20 +0000 (+0000)
Subject: scons: Match some of LLVM warning options.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e518d97d7e8136384d5310235e2dd295170bfdcd;p=mesa.git

scons: Match some of LLVM warning options.

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/scons/llvm.py b/scons/llvm.py
index d145de8d859..be7df9fad29 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