Index: gyp/common_conditions.gypi |
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
index 770269f2b6fbff9e8ed90b185a03ef3692cb08ac..917298f914fcbf810263e3685d0a99bba9c13bca 100644 |
--- a/gyp/common_conditions.gypi |
+++ b/gyp/common_conditions.gypi |
@@ -149,6 +149,22 @@ |
# The following section is common to linux + derivatives and android |
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', |
{ |
+ 'cflags': [ |
+ '-fno-exceptions', |
+ '-fstrict-aliasing', |
+ |
+ '-Wall', |
+ '-Wextra', |
+ '-Winit-self', |
+ '-Wpointer-arith', |
+ |
+ '-Wno-unused-parameter', |
+ '-Wno-c++11-extensions', |
+ ], |
+ 'cflags_cc': [ |
+ '-fno-rtti', |
+ '-Wnon-virtual-dtor', |
+ ], |
'conditions': [ |
[ 'skia_warnings_as_errors', { |
'cflags': [ |
@@ -229,13 +245,6 @@ |
'defines': [ 'NDEBUG' ], |
}, |
}, |
- 'cflags': [ |
- '-Wall', |
- '-Wextra', |
- # suppressions below here were added for clang |
- '-Wno-unused-parameter', |
- '-Wno-c++11-extensions', |
- ], |
'conditions' : [ |
[ 'skia_shared_lib', { |
'cflags': [ |
@@ -474,14 +483,8 @@ |
'-llog', |
], |
'cflags': [ |
- '-Wall', |
- '-fno-exceptions', |
- '-fstrict-aliasing', |
'-fuse-ld=gold', |
], |
- 'cflags_cc': [ |
- '-fno-rtti', |
- ], |
'conditions': [ |
[ 'skia_shared_lib', { |
'cflags': [ |