From efe20b39db674f8bd94b18c603976e86e0ac45a1 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Thu, 28 Jun 2012 17:28:06 +0000 Subject: [PATCH] Only add Mac compiler warning for clang, not gcc. BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/676007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2466 4adac7df-926f-26a2-2b94-8c16560cd09d --- third_party/libvpx/libvpx.gyp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/third_party/libvpx/libvpx.gyp b/third_party/libvpx/libvpx.gyp index ac65da7d54..13981bb6a5 100644 --- a/third_party/libvpx/libvpx.gyp +++ b/third_party/libvpx/libvpx.gyp @@ -10,15 +10,19 @@ # The target_defaults block is unique to the WebRTC libvpx.gyp. 'target_defaults': { 'conditions': [ - ['OS=="mac"', { + ['clang == 1', { 'xcode_settings': { 'WARNING_CFLAGS': [ - '-Wno-implicit-function-declaration', - # TODO(andrew): this one should be fixed upstream. - '-Wno-parentheses-equality', + # libvpx heavily relies on implicit enum casting. '-Wno-conversion', + # libvpx does `if ((a == b))` in some places. + '-Wno-parentheses-equality', ], }, + 'cflags': [ + '-Wno-conversion', + '-Wno-parentheses-equality', + ], }], ], },