Log Message: Work around build problems on Solaris 10. Patch from Joern Clausen per PR 41608. Other platforms are not affected.