diff options
Diffstat (limited to 'chromium/build/common.gypi')
-rw-r--r-- | chromium/build/common.gypi | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/chromium/build/common.gypi b/chromium/build/common.gypi index d7b385cc0ee..e995bd644eb 100644 --- a/chromium/build/common.gypi +++ b/chromium/build/common.gypi @@ -1232,6 +1232,9 @@ # rlz codes for searches but do not use the library. 'enable_rlz%': 0, + # Compile with libc++ instead of libstdc++. + 'use_libcpp%' : 0, + # Turns on the i18n support in V8. 'v8_enable_i18n_support': 1, @@ -2134,6 +2137,18 @@ ['use_clipboard_aurax11==1', { 'defines': ['USE_CLIPBOARD_AURAX11=1'], }], + ['use_libcpp==1', { + 'defines': ['USE_UNORDERED_CONTAINERS=1'], + 'cflags_cc': [ + '-Wno-deprecated-declarations', + '-Wno-newline-eof', + '-Wno-unused-value', + '-Wno-unused-variable', + '-Wno-unused-function', + '-Wno-header-hygiene', + '-stdlib=libc++' + ], + }], ['enable_one_click_signin==1', { 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], }], @@ -3335,7 +3350,7 @@ # Clang considers the `register` keyword as deprecated, but e.g. # code generated by flex (used in angle) contains that keyword. # http://crbug.com/255186 - '-Wno-deprecated-register', + '-Wno-deprecated', ], 'cflags!': [ # Clang doesn't seem to know know this flag. @@ -4043,7 +4058,19 @@ # Clang considers the `register` keyword as deprecated, but e.g. # code generated by flex (used in angle) contains that keyword. # http://crbug.com/255186 - '-Wno-deprecated-register', + '-Wno-deprecated', + ], + }], + ['use_libcpp==1', { + 'OTHER_CPLUSPLUSFLAGS': ['-stdlib=libc++'], + 'USE_LIBCPP': 'YES', + 'WARNING_CFLAGS': [ + '-Wno-deprecated-declarations', + '-Wno-newline-eof', + '-Wno-unused-value', + '-Wno-unused-variable', + '-Wno-unused-function', + '-Wno-header-hygiene', ], }], ['clang==1 and clang_use_chrome_plugins==1', { |