Existing Solaris workaround was broken; mis-matching values caused the test for libiconv to always fail.