diff options
| author | Yi Kong <yikong@google.com> | 2019-03-28 15:53:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-28 15:53:18 -0700 |
| commit | b82e51d36ef520df767a957b8d911ba50fece620 (patch) | |
| tree | 63cddffe568fad30e4cd9d66a547574a2e230bbf /cc/config | |
| parent | 918b8ed0b20349f8bfa8549b91131101883cbe87 (diff) | |
| parent | 16bb6c063d5844eff51ed7ebf268623b7af4c7e5 (diff) | |
| download | build_soong-b82e51d36ef520df767a957b8d911ba50fece620.tar.gz build_soong-b82e51d36ef520df767a957b8d911ba50fece620.tar.bz2 build_soong-b82e51d36ef520df767a957b8d911ba50fece620.zip | |
Merge "Move -Wno-inconsistent-missing-override to ClangExtraCflags" am: 2e03bb7296
am: 16bb6c063d
Change-Id: I857212fc41601d918f57809eb2855316c8a8d640
Diffstat (limited to 'cc/config')
| -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 4ec787f5..08a53c8c 100644 --- a/cc/config/clang.go +++ b/cc/config/clang.go @@ -129,13 +129,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", |