diff --git a/cc/config/clang.go b/cc/config/clang.go
index c0d5746ba..d5c645aa6 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -187,6 +187,9 @@ func init() {
 		// compatibility.
 		"-Wno-c++98-compat-extra-semi",
 
+		// Disable this warning until we can fix all instances where it fails.
+		"-Wno-constant-logical-operand",
+
 		// Disable this warning because we don't care about behavior with older compilers.
 		"-Wno-return-std-move-in-c++11",