aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp/common_conditions.gypi
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-02-04 06:55:36 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-04 06:55:36 -0800
commit779e49602a9c8f4d2799504822e01bcafbcaa534 (patch)
treeb5e26e62b3703b5d3fd5bb61019e69f17b1e0905 /gyp/common_conditions.gypi
parent4dce32c46675efb901618161771d450241af4307 (diff)
Build in C++11 mode on Unix-like bots.
Mac and Windows bots are already building in C++11 mode. This turns on the rest, mostly to see what work remains. This will probably break a few bots. It'd be nice if we could let those all come in as red before reverting this so I can see the full list to fix. BUG=skia: Review URL: https://codereview.chromium.org/868233008
Diffstat (limited to 'gyp/common_conditions.gypi')
-rw-r--r--gyp/common_conditions.gypi4
1 files changed, 1 insertions, 3 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 27dbf2a0e9..d8a93dbafd 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -216,10 +216,10 @@
'-Wpointer-arith',
'-Wsign-compare',
- '-Wno-c++11-extensions',
'-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.
@@ -479,8 +479,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).