--- a/hotspot/src/os/solaris/vm/os_solaris.cpp	Sat Feb 26 13:33:23 2011 -0500
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp	Mon Feb 28 14:19:52 2011 +0100
@@ -2507,7 +2507,7 @@
   assert(ret != 0, "cannot locate libjvm");
   realpath((char *)dlinfo.dli_fname, buf);
 
-  if (strcmp(Arguments::sun_java_launcher(), "gamma") == 0) {
+  if (Arguments::created_by_gamma_launcher()) {
     // Support for the gamma launcher.  Typical value for buf is
     // "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm.so".  If "/jre/lib/" appears at
     // the right place in the string, then assume we are installed in a JDK and