diff options
| author |  mtklein <mtklein@chromium.org> | 2014-06-30 12:33:11 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-30 12:33:11 -0700 |
| commit | 170e00d6403c40114d6ffb800a5bfab73e0b0f34 (patch) | |
| tree | 4a4c6af5e09842d4079c16174bf522679456d916 /gyp | |
| parent | 761b2509d59787a8920b2e98911cff9f88e0eb4e (diff) | |
Have Clang builders build in C++11 mode.
This ought to get us a little ahead on the transition. Only minor fixes
are needed. The one in MemoryBench is the most interesting: what used
to unambiguously be interpreted as concatenating two string literals is
now also ambiguously a user-defined literal; adding a space
disambiguates.
BUG=skia:
R=bungeman@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/361723002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 11 | ||||
| -rw-r--r-- | gyp/libwebp.gyp | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 17eeb78ec5..cfc6d32edc 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -474,9 +474,16 @@ ], }], [ 'skia_clang_build', { + 'cflags_cc': [ + # Build in C++11 mode to make sure we'll have an easy time switching. + '-std=c++11', + '-Wno-unknown-warning-option', # Allows unknown warnings. + '-Wno-deprecated', # From Qt, via debugger (older Clang). + '-Wno-deprecated-register', # From Qt, via debugger (newer Clang). + ], 'cflags': [ - # Extra warnings we like but that only Clang knows about. - '-Wstring-conversion', + # Extra warnings we like but that only Clang knows about. + '-Wstring-conversion', ], 'cflags!': [ '-mfpmath=sse', # Clang doesn't need to be told this, and sometimes gets confused. diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp index 22a51ba13f..64ad971798 100644 --- a/gyp/libwebp.gyp +++ b/gyp/libwebp.gyp @@ -4,6 +4,7 @@ { 'variables': { + 'skia_warnings_as_errors': 0, 'conditions':[ ['skia_android_framework == 1', { 'use_system_libwebp': 1, @@ -159,6 +160,9 @@ 'include_dirs': [ '../third_party/externals/libwebp/src', ], + 'cflags': [ + '-Wno-unused-function', # In C++11 mode, we get this warning when including decode.h. + ] }, 'conditions': [ ['OS!="win"', {'product_name': 'webp'}], |