[#2269] Update support for solaris.