diff --git a/build/docker/scripts/sca.sh b/build/docker/scripts/sca.sh
index 2f2fb68..38803d4 100755
--- a/build/docker/scripts/sca.sh
+++ b/build/docker/scripts/sca.sh
@@ -2,6 +2,18 @@
 set -ev
 
 #
+# Generate thrift files so the static code analysis includes an analysis
+# of the files the thrift compiler spits out.  If running interactively
+# set the NOBUILD environment variable to skip the boot/config/make phase.
+#
+
+if [[ -z "$NOBUILD" ]]; then
+  ./bootstrap.sh
+  ./configure --enable-tutorial=no
+  make -j3 precross
+fi
+
+#
 # C/C++ static code analysis with cppcheck
 # add --error-exitcode=1 to --enable=all as soon as everything is fixed
 #
@@ -21,18 +33,20 @@
 cppcheck --force --quiet --inline-suppr --enable=all -j2 lib/c_glib/src lib/c_glib/test test/c_glib/src tutorial/c_glib
 
 # Silent error checks
-cppcheck --force --quiet --inline-suppr --error-exitcode=1 -j2 compiler/cpp/src
+# See THRIFT-4371 : flex generated code triggers "possible null pointer dereference" in yy_init_buffer
+cppcheck --force --quiet --inline-suppr --suppress="*:thrift/thriftl.cc" --error-exitcode=1 -j2 compiler/cpp/src
 cppcheck --force --quiet --inline-suppr --error-exitcode=1 -j2 lib/cpp/src lib/cpp/test test/cpp tutorial/cpp
 cppcheck --force --quiet --inline-suppr --error-exitcode=1 -j2 lib/c_glib/src lib/c_glib/test test/c_glib/src tutorial/c_glib
 
 # Python code style
 flake8 --ignore=E501 lib/py
 flake8 tutorial/py
-flake8 --ignore=E501 test/py
+# THRIFT-4371 : generated files are excluded because they haven't been scrubbed yet
+flake8 --ignore=E501 --exclude="*/gen-py*/*" test/py
 flake8 test/py.twisted
 flake8 test/py.tornado
 flake8 --ignore=E501 test/test.py
-flake8 --ignore=E501 test/crossrunner
+flake8 --ignore=E501,E722 test/crossrunner
 flake8 test/features
 
 # TODO etc