Mac: Use CLANG_CXX_LANGUAGE_STANDARD instead of OTHER_CPLUSPLUSFLAGS for C++11.
No functionality change now that all bots are on Xcode 4, and it's a bit shorter and cleaner, and fixes a TODO. BUG=147515 R=mark@chromium.org Review URL: https://codereview.chromium.org/23514023 git-svn-id: http://src.chromium.org/svn/trunk/src/build@220729 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
76346d80bd
Коммит
df790d9f98
16
common.gypi
16
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': [
|
||||
|
|
Загрузка…
Ссылка в новой задаче