Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: gyp/common_conditions.gypi

Issue 565213008: Revert of Add a test that uses C++11 features as a compiler canary. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gyp/tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 92095eaf1aa2677e4b6b45806cf75b6eaa7f10a4..338dbc1f87a81ffe8ec325f24844e0bc3f34d3d4 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -202,7 +202,6 @@
'-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.
@@ -454,6 +453,8 @@
}],
[ '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).
@@ -503,10 +504,9 @@
'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
}],
],
- '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
+ '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,7 +546,6 @@
},
'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)',
« no previous file with comments | « no previous file | gyp/tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698