diff --git a/cc/config/clang.go b/cc/config/clang.go
index 6a1c7363b..4ec787f53 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -97,8 +97,9 @@ func init() {
 	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",