From b9d4d279cd381392e69c6638457055264696f7eb Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 4 Feb 2015 07:06:26 -0800 Subject: [PATCH] Revert of Build in C++11 mode on Unix-like bots. (patchset #4 id:60001 of https://codereview.chromium.org/868233008/) Reason for revert: Perf-Ubuntu12, and Test-Ubuntu12, Build-Nacl all too old. Android and Chrome OS builders look ok. Android testers look ok. Chrome OS testers haven't run yet. Original issue's description: > 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: > > Committed: https://skia.googlesource.com/skia/+/779e49602a9c8f4d2799504822e01bcafbcaa534 TBR=stephana@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/879803003 --- gyp/common_conditions.gypi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index d8a93db..27dbf2a 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,6 +479,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). -- 2.7.4