From 4d048d5972595d15e353f7defbf27a4ac2f03df5 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Wed, 27 Mar 2019 18:26:22 -0700 Subject: Move -Wno-inconsistent-missing-override to ClangExtraCflags So that projects can override the flag through cflag (CPPFlags are appended after CFlags). Test: m checkbuild Change-Id: Ib72f4ed4731f41982a0eb8a90c782c09810aa8c9 --- cc/config/clang.go | 4 ++-- 1 file 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", -- cgit v1.2.3