Mercurial > hg > truffle
diff src/os/windows/vm/os_windows.cpp @ 2069:c19157304e08
Merge
author | zgu |
---|---|
date | Wed, 22 Dec 2010 11:52:12 -0500 |
parents | 1e637defdda6 aa6e219afbf1 |
children | 34d64ad817f4 |
line wrap: on
line diff
--- a/src/os/windows/vm/os_windows.cpp Wed Dec 22 11:24:21 2010 -0500 +++ b/src/os/windows/vm/os_windows.cpp Wed Dec 22 11:52:12 2010 -0500 @@ -1711,14 +1711,11 @@ buf[0] = '\0'; if (strcmp(Arguments::sun_java_launcher(), "gamma") == 0) { // Support for the gamma launcher. Check for an - // ALT_JAVA_HOME or JAVA_HOME environment variable + // JAVA_HOME environment variable // and fix up the path so it looks like // libjvm.so is installed there (append a fake suffix // hotspot/libjvm.so). - char* java_home_var = ::getenv("ALT_JAVA_HOME"); - if (java_home_var == NULL) { - java_home_var = ::getenv("JAVA_HOME"); - } + char* java_home_var = ::getenv("JAVA_HOME"); if (java_home_var != NULL && java_home_var[0] != 0) { strncpy(buf, java_home_var, buflen);