Recent changes to the build system that made more warnings be flagged as
errors caused building via clang to break.

Fixes #4795