From a79c47b2be24730bef7942a07859967c8ad4098e Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Sat, 15 Mar 2014 23:21:32 -0700 Subject: [PATCH] Bug 980211 - Suppress clang and gcc warnings in third-party media code: speex, theora, and vpx. r=derf --- media/libspeex_resampler/src/moz.build | 4 ++++ media/libtheora/lib/moz.build | 2 +- media/libvpx/moz.build | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build index d7d0d73b272..4056a6c8e4c 100644 --- a/media/libspeex_resampler/src/moz.build +++ b/media/libspeex_resampler/src/moz.build @@ -41,3 +41,7 @@ if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['OS_TARGET'] != 'Android': DEFINES['_USE_SSE2'] = True if CONFIG['GNU_CC']: SOURCES['resample.c'].flags += ['-msse2'] + +# Suppress warnings in third-party code. +if CONFIG['GNU_CC']: + CFLAGS += ['-Wno-sign-compare'] diff --git a/media/libtheora/lib/moz.build b/media/libtheora/lib/moz.build index d46f7b2d6f0..648b98fae14 100644 --- a/media/libtheora/lib/moz.build +++ b/media/libtheora/lib/moz.build @@ -78,5 +78,5 @@ FINAL_LIBRARY = 'gkmedias' DEFINES['THEORA_DISABLE_ENCODE'] = True # Suppress warnings in third-party code. -if CONFIG['OS_TARGET'] == 'Darwin': +if CONFIG['CLANG_CXX']: CFLAGS += ['-Wno-tautological-compare'] diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build index 54978241803..929bab25fb9 100644 --- a/media/libvpx/moz.build +++ b/media/libvpx/moz.build @@ -87,8 +87,6 @@ if CONFIG['OS_TARGET'] == 'Android': SOURCES += [ '%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'], ] -elif CONFIG['OS_TARGET'] == 'Darwin': - CFLAGS += ['-Wno-sign-compare'] if not CONFIG['_MSC_VER']: for f in SOURCES: @@ -99,3 +97,7 @@ if not CONFIG['_MSC_VER']: SOURCES[f].flags += ['-mssse3'] if 'avx2' in f: SOURCES[f].flags += ['-mavx2'] + +# Suppress warnings in third-party code. +if CONFIG['GNU_CC']: + CFLAGS += ['-Wno-sign-compare']