diff options
| author | thakis <thakis@chromium.org> | 2015-06-26 12:00:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-26 19:00:31 +0000 |
| commit | e0ad0cfd95a0e90bcfb817168cade7bd1143ada4 (patch) | |
| tree | 64be98c61f442d8cdcdb36646de225cf6f9e84ff | |
| parent | 261ed0511eea1e3d10c5daa4dce563d1dfc7b5fc (diff) | |
| download | chromium_src-e0ad0cfd95a0e90bcfb817168cade7bd1143ada4.zip chromium_src-e0ad0cfd95a0e90bcfb817168cade7bd1143ada4.tar.gz chromium_src-e0ad0cfd95a0e90bcfb817168cade7bd1143ada4.tar.bz2 | |
clang/win: Don't pass -Wno-inconsistent-missing-override twice.
It's already passed unconditionally everywhere if clang is used, there's
no need to pass it again for clang/win.
BUG=82385,428099
Review URL: https://codereview.chromium.org/1208363002
Cr-Commit-Position: refs/heads/master@{#336431}
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | build/config/compiler/BUILD.gn | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index eb481f8..350a53c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2592,7 +2592,7 @@ # http://crbug.com/255186 '-Wno-deprecated-register', - # TODO(hans): Get this cleaned up. + # TODO(hans): Get this cleaned up, http://crbug.com/428099 '-Wno-inconsistent-missing-override', ], }, @@ -5731,7 +5731,6 @@ '-Wno-unused-value', '-Wno-unused-variable', '-Wno-unused-local-typedef', # http://crbug.com/411648 - '-Wno-inconsistent-missing-override', # http://crbug.com/428099 ], }, }], diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index f867245..dfeaeed 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -830,7 +830,6 @@ if (is_win) { "-Wno-unused-value", "-Wno-unused-variable", "-Wno-unused-local-typedef", # http://crbug.com/411648 - "-Wno-inconsistent-missing-override", #http://crbug.com/428099 ] } } else { @@ -937,7 +936,7 @@ if (is_clang) { if (!is_nacl) { # Flags NaCl does not recognize. default_warning_flags += [ - # TODO(hans): Get this cleaned up. + # TODO(hans): Get this cleaned up, http://crbug.com/428099 "-Wno-inconsistent-missing-override", ] } |