From b5674a1a5deb3b29b15330c7c9173f96f3186b9c Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 3 Feb 2017 06:01:02 +0000 Subject: [PATCH] Bug 1336329 - Pass clang value from mozbuild to gyp. r=jesup MozReview-Commit-ID: Kjp3R1TUelS --HG-- extra : rebase_source : b9d5ac5ca9e52e2d3c1e891b0fa147d691b49731 --- build/gyp.mozbuild | 1 + media/webrtc/moz.build | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild index f6d547695369..a7066373dbf6 100644 --- a/build/gyp.mozbuild +++ b/build/gyp.mozbuild @@ -18,6 +18,7 @@ gyp_vars.update({ 'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0, # basic stuff for everything 'include_internal_video_render': 0, + 'clang': 1 if CONFIG['CLANG_CXX'] else 0, 'clang_use_chrome_plugins': 0, 'enable_protobuf': 0, 'include_tests': 0, diff --git a/media/webrtc/moz.build b/media/webrtc/moz.build index 21c835f19512..a6ce0f86090d 100644 --- a/media/webrtc/moz.build +++ b/media/webrtc/moz.build @@ -95,11 +95,6 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']: GYP_DIRS['signaling'].non_unified_sources += signaling_non_unified_sources - # We can't enable warnings-as-errors for clang on Linux because of - # some warnings in clang static analysis and ASan builds on Linux. - if CONFIG['CLANG_CXX'] and CONFIG['OS_ARCH'] == 'Linux': - GYP_DIRS['signaling'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True - if CONFIG['_MSC_VER']: # Avoid warnings from third-party code that we can not modify. if CONFIG['CLANG_CL']: @@ -129,10 +124,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': GYP_DIRS['signalingtest'].non_unified_sources += signaling_non_unified_sources - # We can't enable warnings-as-errors for clang on Linux because of - # some warnings in clang static analysis and ASan builds on Linux. - if CONFIG['CLANG_CXX'] and CONFIG['OS_ARCH'] == 'Linux': - GYP_DIRS['signalingtest'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True - if CONFIG['ENABLE_TESTS']: DIRS += ['signaling/fuzztest']