diff options
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 29 | ||||
| -rw-r--r-- | gyp/poppler.gyp | 3 |
2 files changed, 19 insertions, 13 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 770269f2b6..917298f914 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': [ diff --git a/gyp/poppler.gyp b/gyp/poppler.gyp index 5b53389b78..027aea381a 100644 --- a/gyp/poppler.gyp +++ b/gyp/poppler.gyp @@ -129,6 +129,9 @@ 'cflags': [ '-w' ], + 'cflags_cc!': [ + '-fno-rtti' + ], 'conditions': [ ['skia_os == "linux"', { 'include_dirs': [ |