Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
2068:1e637defdda6 | 2069:c19157304e08 |
---|---|
1709 } | 1709 } |
1710 | 1710 |
1711 buf[0] = '\0'; | 1711 buf[0] = '\0'; |
1712 if (strcmp(Arguments::sun_java_launcher(), "gamma") == 0) { | 1712 if (strcmp(Arguments::sun_java_launcher(), "gamma") == 0) { |
1713 // Support for the gamma launcher. Check for an | 1713 // Support for the gamma launcher. Check for an |
1714 // ALT_JAVA_HOME or JAVA_HOME environment variable | 1714 // JAVA_HOME environment variable |
1715 // and fix up the path so it looks like | 1715 // and fix up the path so it looks like |
1716 // libjvm.so is installed there (append a fake suffix | 1716 // libjvm.so is installed there (append a fake suffix |
1717 // hotspot/libjvm.so). | 1717 // hotspot/libjvm.so). |
1718 char* java_home_var = ::getenv("ALT_JAVA_HOME"); | 1718 char* java_home_var = ::getenv("JAVA_HOME"); |
1719 if (java_home_var == NULL) { | |
1720 java_home_var = ::getenv("JAVA_HOME"); | |
1721 } | |
1722 if (java_home_var != NULL && java_home_var[0] != 0) { | 1719 if (java_home_var != NULL && java_home_var[0] != 0) { |
1723 | 1720 |
1724 strncpy(buf, java_home_var, buflen); | 1721 strncpy(buf, java_home_var, buflen); |
1725 | 1722 |
1726 // determine if this is a legacy image or modules image | 1723 // determine if this is a legacy image or modules image |