diff --git a/SConstruct b/SConstruct
index f1f1c64f07..4d91eae3f0 100755
--- a/SConstruct
+++ b/SConstruct
@@ -418,6 +418,13 @@ for variant_path in variant_paths:
                     conf.CheckLinkFlag(
                             '-Wl,--thread-count=%d' % GetOption('num_jobs'))
 
+        # Treat warnings as errors but white list some warnings that we
+        # want to allow (e.g., deprecation warnings).
+        env.Append(CCFLAGS=['-Werror',
+                             '-Wno-error=deprecated-declarations',
+                             '-Wno-error=deprecated',
+                            ])
+
     else:
         error('\n'.join((
               "Don't know what compiler options to use for your compiler.",