Still can't build 21.0-b46 on Solaris