From 4df08ff37459ee7c9d545c2574c1a84b5e968243 Mon Sep 17 00:00:00 2001 From: sergeyu Date: Wed, 2 Sep 2015 14:22:40 -0700 Subject: [PATCH] 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 | 2 +- webrtc/modules/desktop_capture/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index a3793f5ebb..05e2e19306 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -274,7 +274,7 @@ source_set("rtc_event_log") { 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" ] diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn index 17135ccb86..aa33993192 100644 --- a/webrtc/modules/desktop_capture/BUILD.gn +++ b/webrtc/modules/desktop_capture/BUILD.gn @@ -127,7 +127,7 @@ source_set("desktop_capture") { 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" ]