diff options
| author | Yi Kong <yikong@google.com> | 2019-03-28 22:37:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-28 22:37:47 +0000 |
| commit | 2e03bb7296c434e8d22d86556ea76bc759404110 (patch) | |
| tree | ae29cb97c6c438b0e78a38178917fdf646616240 /cc | |
| parent | 9e50e6955f8c340444c886033e86b85ed3b2cfde (diff) | |
| parent | 4d048d5972595d15e353f7defbf27a4ac2f03df5 (diff) | |
| download | build_soong-2e03bb7296c434e8d22d86556ea76bc759404110.tar.gz build_soong-2e03bb7296c434e8d22d86556ea76bc759404110.tar.bz2 build_soong-2e03bb7296c434e8d22d86556ea76bc759404110.zip | |
Merge "Move -Wno-inconsistent-missing-override to ClangExtraCflags"
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/config/clang.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/config/clang.go b/cc/config/clang.go index 81439f3d..347bfaba 100644 --- a/cc/config/clang.go +++ b/cc/config/clang.go @@ -132,13 +132,13 @@ func init() { // Warnings from clang-8.0 "-Wno-defaulted-function-deleted", - }, " ")) - pctx.StaticVariable("ClangExtraCppflags", strings.Join([]string{ // Disable -Winconsistent-missing-override until we can clean up the existing // codebase for it. "-Wno-inconsistent-missing-override", + }, " ")) + pctx.StaticVariable("ClangExtraCppflags", strings.Join([]string{ // Enable clang's thread-safety annotations in libcxx. // Turn off -Wthread-safety-negative, to avoid breaking projects that use -Weverything. "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS", |