| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index a13bc6f139c6d2a2e21b275569b341fdbe5dde82..27de0576926fbd294120aa0a3150399f1db28749 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -3865,6 +3865,12 @@
|
| 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
|
| 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
|
|
|
| + # gnu++11 instead of c++11 is needed because some code uses
|
| + # typeof() (a GNU extension).
|
| + # TODO(thakis): Eventually switch this to c++11 instead of
|
| + # gnu++11 (once typeof can be removed, which is blocked on c++11
|
| + # being available everywhere).
|
| + 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11', # -std=gnu++11
|
| # Don't use -Wc++0x-extensions, which Xcode 4 enables by default
|
| # when building with clang. This warning is triggered when the
|
| # override keyword is used via the OVERRIDE macro from
|
| @@ -3902,16 +3908,6 @@
|
| # http://crbug.com/255186
|
| '-Wno-deprecated-register',
|
| ],
|
| - 'OTHER_CPLUSPLUSFLAGS': [
|
| - # gnu++11 instead of c++11 is needed because some code uses
|
| - # typeof() (a GNU extension).
|
| - # TODO(thakis): Eventually switch this to c++11 instead of
|
| - # gnu++11 (once typeof can be removed, which is blocked on c++11
|
| - # being available everywhere).
|
| - # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all
|
| - # bots use xcode 4 -- http://crbug.com/147515).
|
| - '$(inherited)', '-std=gnu++11',
|
| - ],
|
| }],
|
| ['clang==1 and clang_use_chrome_plugins==1', {
|
| 'OTHER_CFLAGS': [
|
|
|