diff options
| author | thakis <thakis@chromium.org> | 2016-01-04 11:00:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-04 19:01:03 +0000 |
| commit | ab5bf4828ec6e3f1f51667e5adff9ff606614ff7 (patch) | |
| tree | 86867d131a3f7553005e0a5814a5c2adf6f1544f /build/common.gypi | |
| parent | 1819fa8dedb31cb29a2dae8630bb3c2b34e91579 (diff) | |
| download | chromium_src-ab5bf4828ec6e3f1f51667e5adff9ff606614ff7.zip chromium_src-ab5bf4828ec6e3f1f51667e5adff9ff606614ff7.tar.gz chromium_src-ab5bf4828ec6e3f1f51667e5adff9ff606614ff7.tar.bz2 | |
Remove small amounts of repitition in build/common.gypi
No intended behavior change.
BUG=none
Review URL: https://codereview.chromium.org/1556953002
Cr-Commit-Position: refs/heads/master@{#367336}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1351edc..c62e8b8 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3439,6 +3439,16 @@ 'PreprocessorDefinitions': ['_DEBUG'], }, }, + 'variables': { + 'clang_warning_flags': [ + # Allow comparing the address of references and 'this' against 0 + # in debug builds. Technically, these can never be null in + # well-defined C/C++ and Clang can optimize such checks away in + # release builds, but they may be used in asserts in debug builds. + '-Wno-undefined-bool-conversion', + '-Wno-tautological-undefined-compare', + ], + }, 'conditions': [ ['OS=="linux" or OS=="android"', { 'target_conditions': [ @@ -3462,30 +3472,6 @@ ], }, }], - ['clang==1', { - 'cflags': [ - # Allow comparing the address of references and 'this' against 0 - # in debug builds. Technically, these can never be null in - # well-defined C/C++ and Clang can optimize such checks away in - # release builds, but they may be used in asserts in debug builds. - '-Wno-undefined-bool-conversion', - '-Wno-tautological-undefined-compare', - ], - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-Wno-undefined-bool-conversion', - '-Wno-tautological-undefined-compare', - ], - }, - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': [ - '-Wno-undefined-bool-conversion', - '-Wno-tautological-undefined-compare', - ], - }, - }, - }], ], }, 'Release_Base': { |