Merge "Remove unneeded -Wno-expansion-to-defined flag" am: e2025abe96
am: 353bdb292f

Change-Id: I80c01c4875530e7b93bc51b4af5b527f040f9ed0
diff --git a/cc/config/clang.go b/cc/config/clang.go
index 6d83879..e7d2dd2 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -97,8 +97,9 @@
 	pctx.StaticVariable("ClangExtraCflags", strings.Join([]string{
 		"-D__compiler_offsetof=__builtin_offsetof",
 
-		// -Wimplicit-fallthrough is not enabled by -Wall.
+		// Make implicit fallthrough an error in the future.
 		"-Wimplicit-fallthrough",
+		"-Wno-error=implicit-fallthrough",
 
 		// Help catch common 32/64-bit errors.
 		"-Werror=int-conversion",