From 7cae30cbe1200854bbe26205ab53d0f418c8d443 Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 16 Dec 2015 14:05:29 -0800 Subject: Disable warnings failing when using Clang on Windows. This makes it possible to build WebRTC using Clang on Windows. Depends on https://codereview.webrtc.org/1524703006/ BUG=webrtc:5360, webrtc:5366 NOTRY=True Review URL: https://codereview.webrtc.org/1522223002 Cr-Commit-Position: refs/heads/master@{#11058} --- webrtc/base/base.gyp | 11 +++++++++++ webrtc/base/base_tests.gyp | 12 ++++++++++++ 2 files changed, 23 insertions(+) (limited to 'webrtc/base') diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index cc7d0c3213..37421f7bae 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -541,6 +541,17 @@ 'WEBRTC_EXTERNAL_JSON', ], }], + ['OS=="win" and clang==1', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + # Disable warnings failing when compiling with Clang on Windows. + # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 + '-Wno-missing-braces', + ], + }, + }, + }], ], }], ['OS == "android"', { diff --git a/webrtc/base/base_tests.gyp b/webrtc/base/base_tests.gyp index b813197422..5d73d50756 100644 --- a/webrtc/base/base_tests.gyp +++ b/webrtc/base/base_tests.gyp @@ -134,6 +134,18 @@ 'win32windowpicker_unittest.cc', ], }], + ['OS=="win" and clang==1', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + # Disable warnings failing when compiling with Clang on Windows. + # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 + '-Wno-missing-braces', + '-Wno-unused-const-variable', + ], + }, + }, + }], ['OS=="mac"', { 'sources': [ 'macutils_unittest.cc', -- cgit v1.2.3