diff options
| author |  mtklein <mtklein@chromium.org> | 2014-09-12 17:02:51 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-12 17:02:52 -0700 |
| commit | 86e01df8d1d8848044c3fcc31c1a2008b70fe08c (patch) | |
| tree | 314ae8cd63a297ca701d2b0567fb5f7e99134b98 /gyp/common_conditions.gypi | |
| parent | c34b0d4e9ad5806c1f882a1f85191f2ea8ddcdba (diff) | |
Add a test that uses C++11 features as a compiler canary.
BUG=skia:
R=bungeman@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/568913002
Diffstat (limited to 'gyp/common_conditions.gypi')
| -rw-r--r-- | gyp/common_conditions.gypi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 338dbc1f87..92095eaf1a 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -202,6 +202,7 @@ '-Wno-unused-parameter', ], 'cflags_cc': [ + '-std=c++11', '-fno-rtti', '-Wnon-virtual-dtor', '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what is POD. @@ -453,8 +454,6 @@ }], [ '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). @@ -504,9 +503,10 @@ 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', }], ], - 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 - 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hidden - 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-inlines-hidden + 'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x', # -std=c++11 + 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 + 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hidden + 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-inlines-hidden 'WARNING_CFLAGS': [ '-Wall', '-Wextra', @@ -546,6 +546,7 @@ }, 'xcode_settings': { 'ARCHS': ['armv7'], + 'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x', # -std=c++11 'CODE_SIGNING_REQUIRED': 'NO', 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', |