Build changes for Solaris x86 & Sparc.