commit 4df08ff37459ee7c9d545c2574c1a84b5e968243
author sergeyu <sergeyu@chromium.org> Wed Sep 02 14:22:40 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Sep 02 21:22:48 2015 +0000
tree 292a34c2aa82252460351721fc93e3e9a60bc8d8
parent 1a591ddc7e6529e57a27f4a8f133ddd14a7ead16

GN: Fix compilation with NaCl toolchain

BUG=512899
TBR=kjellander@webrtc.org

Review URL: https://codereview.webrtc.org/1327853002

Cr-Commit-Position: refs/heads/master@{#9846}

webrtc/BUILD.gn

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index a3793f5..05e2e19 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -274,7 +274,7 @@
     defines += [ "ENABLE_RTC_EVENT_LOG" ]
     deps += [ ":rtc_event_log_proto" ]
   }
-  if (is_clang) {
+  if (is_clang && !is_nacl) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
     configs -= [ "//build/config/clang:find_bad_constructs" ]

webrtc/modules/desktop_capture/BUILD.gn

diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn
index 17135cc..aa33993 100644
--- a/webrtc/modules/desktop_capture/BUILD.gn
+++ b/webrtc/modules/desktop_capture/BUILD.gn
@@ -127,7 +127,7 @@
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
 
-  if (is_clang) {
+  if (is_clang && !is_nacl) {
     # Suppress warnings from Chrome's Clang plugins.
     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
     configs -= [ "//build/config/clang:find_bad_constructs" ]