Jeff will update the build system later to remove the C++ checks per the above caveat. This commit was SVN r21568.