TRIVIAL added support for solaris