Bug 1192070 - avoid complaining about missing override keywords in skia; r=glandium
authorNathan Froyd <froydnj@mozilla.com>
Fri, 07 Aug 2015 01:34:57 -0400
changeset 256738 8fc2a69b16c0392f21eaec7fcfe9148f6c4b7872
parent 256737 6f7075c3966fbd419a3fdeec6bfc112017df1898
child 256739 efc97cd68267c35d255daa6c2aa2baeddc4daf94
push id29187
push usercbook@mozilla.com
push dateFri, 07 Aug 2015 11:13:32 +0000
treeherdermozilla-central@3e51753a099f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1192070
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1192070 - avoid complaining about missing override keywords in skia; r=glandium
gfx/skia/generate_mozbuild.py
gfx/skia/moz.build
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -135,17 +135,19 @@ elif CONFIG['CLANG_CL']:
 DEFINES['SKIA_IMPLEMENTATION'] = 1
 DEFINES['GR_IMPLEMENTATION'] = 1
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
     ]
-    if not CONFIG['CLANG_CXX']:
+    if CONFIG['CLANG_CXX']:
+        CXXFLAGS += ['-Wno-inconsistent-missing-override']
+    else:
         CXXFLAGS += ['-Wno-logical-op']
     if CONFIG['CPU_ARCH'] == 'arm':
         SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -663,17 +663,19 @@ elif CONFIG['CLANG_CL']:
 DEFINES['SKIA_IMPLEMENTATION'] = 1
 DEFINES['GR_IMPLEMENTATION'] = 1
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
     ]
-    if not CONFIG['CLANG_CXX']:
+    if CONFIG['CLANG_CXX']:
+        CXXFLAGS += ['-Wno-inconsistent-missing-override']
+    else:
         CXXFLAGS += ['-Wno-logical-op']
     if CONFIG['CPU_ARCH'] == 'arm':
         SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']